You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/03/19 02:41:31 UTC
[50/50] [abbrv] git commit: [flex-sdk] [refs/heads/new_android_skins]
- Resolve conflict
Resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/90ad7ff2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/90ad7ff2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/90ad7ff2
Branch: refs/heads/new_android_skins
Commit: 90ad7ff23fee2577a27d5f8097fee13b673429cc
Parents: c1435e3
Author: Om <bi...@gmail.com>
Authored: Tue Mar 18 18:37:55 2014 -0700
Committer: Om <bi...@gmail.com>
Committed: Tue Mar 18 18:37:55 2014 -0700
----------------------------------------------------------------------
.../mobiletheme/src/spark/skins/mobile/ActionBarSkin.as | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/90ad7ff2/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
index 2a41a02..6e1bba3 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
@@ -90,15 +90,9 @@ public class ActionBarSkin extends MobileSkin
switch (applicationDPI)
{
-<<<<<<< HEAD
-
- case DPIClassification.DPI_640:
- {
-=======
case DPIClassification.DPI_640:
{
// Note provisional may need changes
->>>>>>> develop
borderSize = 2;
layoutShadowHeight = 12;
layoutContentGroupHeight = 172;
@@ -115,11 +109,6 @@ public class ActionBarSkin extends MobileSkin
layoutShadowHeight = 9;
layoutContentGroupHeight = 130;
layoutTitleGroupHorizontalPadding = 40;
-<<<<<<< HEAD
-
-=======
-
->>>>>>> develop
borderClass = spark.skins.mobile480.assets.ActionBarBackground;
break;