You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/09/02 01:40:11 UTC
[09/41] git commit: [flex-sdk] [refs/heads/develop] - Added 160 and
640 dpi draft AS skins
Added 160 and 640 dpi draft AS skins
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/07289a63
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/07289a63
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/07289a63
Branch: refs/heads/develop
Commit: 07289a631d2a466f8b47b651aca83938cace1097
Parents: 4611721
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Aug 10 14:55:57 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Aug 10 14:55:57 2013 +1000
----------------------------------------------------------------------
.../src/spark/components/Callout.as | 20 +++--
.../src/spark/components/IconItemRenderer.as | 20 +++--
.../src/spark/components/LabelItemRenderer.as | 20 +++--
.../spark/components/SpinnerListItemRenderer.as | 20 +++--
.../spark/preloaders/SplashScreenImageSource.as | 2 +-
.../skins/mobile/BeveledActionButtonSkin.as | 72 ++++++++++++++----
.../spark/skins/mobile/BeveledBackButtonSkin.as | 72 +++++++++++++-----
.../skins/mobile/ButtonBarFirstButtonSkin.as | 46 ++++++++---
.../skins/mobile/ButtonBarLastButtonSkin.as | 46 ++++++++---
.../skins/mobile/ButtonBarMiddleButtonSkin.as | 42 +++++++---
.../src/spark/skins/mobile/ButtonSkin.as | 72 +++++++++++++-----
.../spark/skins/mobile/CalloutActionBarSkin.as | 20 +++--
.../src/spark/skins/mobile/CalloutSkin.as | 35 +++++++++
.../skins/mobile/CalloutViewNavigatorSkin.as | 30 ++++++--
.../src/spark/skins/mobile/CheckBoxSkin.as | 54 ++++++++++++-
.../src/spark/skins/mobile/HScrollBarSkin.as | 28 +++++--
.../spark/skins/mobile/HScrollBarThumbSkin.as | 8 +-
.../src/spark/skins/mobile/HSliderThumbSkin.as | 73 +++++++++++++-----
.../src/spark/skins/mobile/HSliderTrackSkin.as | 47 +++++++++---
.../src/spark/skins/mobile/ImageSkin.as | 22 ++++--
.../src/spark/skins/mobile/RadioButtonSkin.as | 80 +++++++++++++++-----
.../skins/mobile/SpinnerListContainerSkin.as | 51 ++++++++++---
.../src/spark/skins/mobile/SpinnerListSkin.as | 1 +
.../src/spark/skins/mobile/StageTextAreaSkin.as | 20 +++--
.../TabbedViewNavigatorTabBarFirstTabSkin.as | 8 ++
.../TabbedViewNavigatorTabBarLastTabSkin.as | 2 +
.../skins/mobile/TextAreaHScrollBarSkin.as | 28 +++++--
.../skins/mobile/TextAreaHScrollBarThumbSkin.as | 33 +++++---
.../src/spark/skins/mobile/TextAreaSkin.as | 42 +++++++---
.../skins/mobile/TextAreaVScrollBarSkin.as | 28 +++++--
.../skins/mobile/TextAreaVScrollBarThumbSkin.as | 34 ++++++---
.../src/spark/skins/mobile/TextInputSkin.as | 42 +++++++---
.../src/spark/skins/mobile/ToggleSwitchSkin.as | 54 +++++++++----
.../src/spark/skins/mobile/VScrollBarSkin.as | 28 +++++--
.../spark/skins/mobile/VScrollBarThumbSkin.as | 8 +-
.../src/spark/skins/mobile/ViewMenuItemSkin.as | 70 +++++++++++++----
.../src/spark/skins/mobile/ViewMenuSkin.mxml | 14 ++--
.../supportClasses/ActionBarButtonSkinBase.as | 27 ++++++-
.../skins/mobile/supportClasses/CalloutArrow.as | 34 +++++++--
.../mobile/supportClasses/HSliderDataTip.as | 54 +++++++++----
.../mobile/supportClasses/StageTextSkinBase.as | 42 ++++++----
.../TabbedViewNavigatorTabBarTabSkinBase.as | 48 ++++++++----
42 files changed, 1154 insertions(+), 343 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobilecomponents/src/spark/components/Callout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/Callout.as b/frameworks/projects/mobilecomponents/src/spark/components/Callout.as
index 7443ec2..8615ab5 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/Callout.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/Callout.as
@@ -482,6 +482,11 @@ public class Callout extends SkinnablePopUpContainer
{
switch (dpi)
{
+ case DPIClassification.DPI_640:
+ {
+ _margin = 32;
+ break;
+ }
case DPIClassification.DPI_480:
{
_margin = 24;
@@ -492,11 +497,16 @@ public class Callout extends SkinnablePopUpContainer
_margin = 16;
break;
}
- case DPIClassification.DPI_240:
- {
- _margin = 12;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ _margin = 12;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ _margin = 6;
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as b/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
index ccd11b9..1f34cfc 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/IconItemRenderer.as
@@ -218,6 +218,11 @@ public class IconItemRenderer extends LabelItemRenderer
// set default messageDisplay width
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ oldUnscaledWidth = 1280;
+ break;
+ }
case DPIClassification.DPI_480:
{
oldUnscaledWidth = 960;
@@ -228,11 +233,16 @@ public class IconItemRenderer extends LabelItemRenderer
oldUnscaledWidth = 640;
break;
}
- case DPIClassification.DPI_240:
- {
- oldUnscaledWidth = 480;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ oldUnscaledWidth = 480;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ oldUnscaledWidth = 240;
+ break;
+ }
default:
{
// default PPI160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobilecomponents/src/spark/components/LabelItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/LabelItemRenderer.as b/frameworks/projects/mobilecomponents/src/spark/components/LabelItemRenderer.as
index 21d9d45..97ab8ee 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/LabelItemRenderer.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/LabelItemRenderer.as
@@ -273,6 +273,11 @@ public class LabelItemRenderer extends UIComponent
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ minHeight = 176;
+ break;
+ }
case DPIClassification.DPI_480:
{
minHeight = 132;
@@ -283,11 +288,16 @@ public class LabelItemRenderer extends UIComponent
minHeight = 88;
break;
}
- case DPIClassification.DPI_240:
- {
- minHeight = 66;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ minHeight = 66;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ minHeight = 33;
+ break;
+ }
default:
{
// default PPI160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as b/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
index d876009..1a5f26a 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/SpinnerListItemRenderer.as
@@ -50,6 +50,11 @@ public class SpinnerListItemRenderer extends LabelItemRenderer
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ minHeight = 40;
+ break;
+ }
case DPIClassification.DPI_480:
{
minHeight = 30;
@@ -60,11 +65,16 @@ public class SpinnerListItemRenderer extends LabelItemRenderer
minHeight = 20;
break;
}
- case DPIClassification.DPI_240:
- {
- minHeight = 15;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ minHeight = 15;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ minHeight = 8;
+ break;
+ }
default: // default PPI160
{
minHeight = 10;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobilecomponents/src/spark/preloaders/SplashScreenImageSource.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/preloaders/SplashScreenImageSource.as b/frameworks/projects/mobilecomponents/src/spark/preloaders/SplashScreenImageSource.as
index 4c28e67..ca20193 100644
--- a/frameworks/projects/mobilecomponents/src/spark/preloaders/SplashScreenImageSource.as
+++ b/frameworks/projects/mobilecomponents/src/spark/preloaders/SplashScreenImageSource.as
@@ -130,7 +130,7 @@ public class SplashScreenImageSource
// dpi
//----------------------------------
- [Inspectable(category="General", enumeration="160,240,320,480")]
+ [Inspectable(category="General", enumeration="120,160,240,320,480,640")]
/**
* The required DPI of the device to display the associated image.
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledActionButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledActionButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledActionButtonSkin.as
index 1a45b4b..9cd8745 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledActionButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledActionButtonSkin.as
@@ -26,6 +26,9 @@ import mx.core.DPIClassification;
import mx.core.mx_internal;
import spark.skins.mobile.supportClasses.MobileSkin;
+import spark.skins.mobile120.assets.BeveledActionButton_down;
+import spark.skins.mobile120.assets.BeveledActionButton_fill;
+import spark.skins.mobile120.assets.BeveledActionButton_up;
import spark.skins.mobile160.assets.BeveledActionButton_down;
import spark.skins.mobile160.assets.BeveledActionButton_fill;
import spark.skins.mobile160.assets.BeveledActionButton_up;
@@ -38,6 +41,9 @@ import spark.skins.mobile320.assets.BeveledActionButton_up;
import spark.skins.mobile480.assets.BeveledActionButton_down;
import spark.skins.mobile480.assets.BeveledActionButton_fill;
import spark.skins.mobile480.assets.BeveledActionButton_up;
+import spark.skins.mobile640.assets.BeveledActionButton_down;
+import spark.skins.mobile640.assets.BeveledActionButton_fill;
+import spark.skins.mobile640.assets.BeveledActionButton_up;
use namespace mx_internal;
@@ -77,6 +83,23 @@ public class BeveledActionButtonSkin extends ButtonSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ // Note provisional may need changes
+ layoutBorderSize = 0;
+ layoutPaddingTop = 0;
+ layoutPaddingBottom = 0;
+ layoutPaddingLeft = 40;
+ layoutPaddingRight = 40;
+ measuredDefaultWidth = 108;
+ measuredDefaultHeight = 108;
+
+ upBorderSkin = spark.skins.mobile640.assets.BeveledActionButton_up;
+ downBorderSkin = spark.skins.mobile640.assets.BeveledActionButton_down;
+ fillClass = spark.skins.mobile640.assets.BeveledActionButton_fill;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -110,22 +133,39 @@ public class BeveledActionButtonSkin extends ButtonSkin
break;
}
- case DPIClassification.DPI_240:
- {
- layoutBorderSize = 0;
- layoutPaddingTop = 0;
- layoutPaddingBottom = 0;
- layoutPaddingLeft = 15;
- layoutPaddingRight = 15;
- measuredDefaultWidth = 42;
- measuredDefaultHeight = 42;
-
- upBorderSkin = spark.skins.mobile240.assets.BeveledActionButton_up;
- downBorderSkin = spark.skins.mobile240.assets.BeveledActionButton_down;
- fillClass = spark.skins.mobile240.assets.BeveledActionButton_fill;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ layoutBorderSize = 0;
+ layoutPaddingTop = 0;
+ layoutPaddingBottom = 0;
+ layoutPaddingLeft = 15;
+ layoutPaddingRight = 15;
+ measuredDefaultWidth = 42;
+ measuredDefaultHeight = 42;
+
+ upBorderSkin = spark.skins.mobile240.assets.BeveledActionButton_up;
+ downBorderSkin = spark.skins.mobile240.assets.BeveledActionButton_down;
+ fillClass = spark.skins.mobile240.assets.BeveledActionButton_fill;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ // Note provisional may need changes
+ layoutBorderSize = 0;
+ layoutPaddingTop = 0;
+ layoutPaddingBottom = 0;
+ layoutPaddingLeft = 8;
+ layoutPaddingRight = 8;
+ measuredDefaultWidth = 21;
+ measuredDefaultHeight = 21;
+
+ upBorderSkin = spark.skins.mobile120.assets.BeveledActionButton_up;
+ downBorderSkin = spark.skins.mobile120.assets.BeveledActionButton_down;
+ fillClass = spark.skins.mobile120.assets.BeveledActionButton_fill;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as
index 1f397b6..e49403d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/BeveledBackButtonSkin.as
@@ -26,6 +26,8 @@ import mx.core.DPIClassification;
import mx.core.mx_internal;
import spark.skins.mobile.supportClasses.MobileSkin;
+import spark.skins.mobile120.assets.BeveledBackButton_down;
+import spark.skins.mobile120.assets.BeveledBackButton_up;
import spark.skins.mobile160.assets.BeveledBackButton_down;
import spark.skins.mobile160.assets.BeveledBackButton_up;
import spark.skins.mobile240.assets.BeveledBackButton_down;
@@ -35,6 +37,8 @@ import spark.skins.mobile320.assets.BeveledBackButton_down;
import spark.skins.mobile320.assets.BeveledBackButton_up;
import spark.skins.mobile480.assets.BeveledBackButton_down;
import spark.skins.mobile480.assets.BeveledBackButton_up;
+import spark.skins.mobile640.assets.BeveledBackButton_down;
+import spark.skins.mobile640.assets.BeveledBackButton_up;
use namespace mx_internal;
@@ -72,6 +76,23 @@ public class BeveledBackButtonSkin extends ButtonSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ // Note provisional may need changes
+ layoutBorderSize = 0;
+ layoutPaddingTop = 0;
+ layoutPaddingBottom = 0;
+ layoutPaddingLeft = 64;
+ layoutPaddingRight = 40;
+ measuredDefaultWidth = 232;
+ measuredDefaultHeight = 108;
+
+ upBorderSkin = spark.skins.mobile640.assets.BeveledBackButton_up;
+ downBorderSkin = spark.skins.mobile640.assets.BeveledBackButton_down;
+ fillClass = spark.skins.mobile640.assets.BeveledBackButton_fill;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -106,23 +127,40 @@ public class BeveledBackButtonSkin extends ButtonSkin
break;
}
- case DPIClassification.DPI_240:
- {
- // 240
- layoutBorderSize = 0;
- layoutPaddingTop = 0;
- layoutPaddingBottom = 0;
- layoutPaddingLeft = 23;
- layoutPaddingRight = 15;
- measuredDefaultWidth = 87;
- measuredDefaultHeight = 42;
-
- upBorderSkin = spark.skins.mobile240.assets.BeveledBackButton_up;
- downBorderSkin = spark.skins.mobile240.assets.BeveledBackButton_down;
- fillClass = spark.skins.mobile240.assets.BeveledBackButton_fill;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ // 240
+ layoutBorderSize = 0;
+ layoutPaddingTop = 0;
+ layoutPaddingBottom = 0;
+ layoutPaddingLeft = 23;
+ layoutPaddingRight = 15;
+ measuredDefaultWidth = 87;
+ measuredDefaultHeight = 42;
+
+ upBorderSkin = spark.skins.mobile240.assets.BeveledBackButton_up;
+ downBorderSkin = spark.skins.mobile240.assets.BeveledBackButton_down;
+ fillClass = spark.skins.mobile240.assets.BeveledBackButton_fill;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ // Note provisional may need changes
+ layoutBorderSize = 0;
+ layoutPaddingTop = 0;
+ layoutPaddingBottom = 0;
+ layoutPaddingLeft = 12;
+ layoutPaddingRight = 8;
+ measuredDefaultWidth = 44;
+ measuredDefaultHeight = 21;
+
+ upBorderSkin = spark.skins.mobile120.assets.BeveledBackButton_up;
+ downBorderSkin = spark.skins.mobile120.assets.BeveledBackButton_down;
+ fillClass = spark.skins.mobile120.assets.BeveledBackButton_fill;
+
+ break;
+ }
default:
{
// 160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarFirstButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarFirstButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarFirstButtonSkin.as
index 7f05784..90ed163 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarFirstButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarFirstButtonSkin.as
@@ -22,6 +22,9 @@ package spark.skins.mobile
import mx.core.DPIClassification;
import spark.skins.mobile.supportClasses.ButtonBarButtonSkinBase;
+import spark.skins.mobile120.assets.ButtonBarFirstButton_down;
+import spark.skins.mobile120.assets.ButtonBarFirstButton_selected;
+import spark.skins.mobile120.assets.ButtonBarFirstButton_up;
import spark.skins.mobile160.assets.ButtonBarFirstButton_down;
import spark.skins.mobile160.assets.ButtonBarFirstButton_selected;
import spark.skins.mobile160.assets.ButtonBarFirstButton_up;
@@ -34,6 +37,9 @@ import spark.skins.mobile320.assets.ButtonBarFirstButton_up;
import spark.skins.mobile480.assets.ButtonBarFirstButton_down;
import spark.skins.mobile480.assets.ButtonBarFirstButton_selected;
import spark.skins.mobile480.assets.ButtonBarFirstButton_up;
+import spark.skins.mobile640.assets.ButtonBarFirstButton_down;
+import spark.skins.mobile640.assets.ButtonBarFirstButton_selected;
+import spark.skins.mobile640.assets.ButtonBarFirstButton_up;
/**
* Button skin for the first Button in a ButtonBar.
*
@@ -60,6 +66,16 @@ public class ButtonBarFirstButtonSkin extends ButtonBarButtonSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ upBorderSkin = spark.skins.mobile640.assets.ButtonBarFirstButton_up;
+ downBorderSkin = spark.skins.mobile640.assets.ButtonBarFirstButton_down;
+ selectedBorderSkin = spark.skins.mobile640.assets.ButtonBarFirstButton_selected;
+
+ cornerRadius = 24;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
upBorderSkin = spark.skins.mobile480.assets.ButtonBarFirstButton_up;
@@ -80,16 +96,26 @@ public class ButtonBarFirstButtonSkin extends ButtonBarButtonSkinBase
break;
}
- case DPIClassification.DPI_240:
- {
- upBorderSkin = spark.skins.mobile240.assets.ButtonBarFirstButton_up;
- downBorderSkin = spark.skins.mobile240.assets.ButtonBarFirstButton_down;
- selectedBorderSkin = spark.skins.mobile240.assets.ButtonBarFirstButton_selected;
-
- cornerRadius = 8;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ upBorderSkin = spark.skins.mobile240.assets.ButtonBarFirstButton_up;
+ downBorderSkin = spark.skins.mobile240.assets.ButtonBarFirstButton_down;
+ selectedBorderSkin = spark.skins.mobile240.assets.ButtonBarFirstButton_selected;
+
+ cornerRadius = 8;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ upBorderSkin = spark.skins.mobile120.assets.ButtonBarFirstButton_up;
+ downBorderSkin = spark.skins.mobile120.assets.ButtonBarFirstButton_down;
+ selectedBorderSkin = spark.skins.mobile120.assets.ButtonBarFirstButton_selected;
+
+ cornerRadius = 4;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as
index 2019d1a..64248f8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarLastButtonSkin.as
@@ -22,6 +22,9 @@ package spark.skins.mobile
import mx.core.DPIClassification;
import spark.skins.mobile.supportClasses.ButtonBarButtonSkinBase;
+import spark.skins.mobile120.assets.ButtonBarLastButton_down;
+import spark.skins.mobile120.assets.ButtonBarLastButton_selected;
+import spark.skins.mobile120.assets.ButtonBarLastButton_up;
import spark.skins.mobile160.assets.ButtonBarLastButton_down;
import spark.skins.mobile160.assets.ButtonBarLastButton_selected;
import spark.skins.mobile160.assets.ButtonBarLastButton_up;
@@ -34,6 +37,9 @@ import spark.skins.mobile320.assets.ButtonBarLastButton_up;
import spark.skins.mobile480.assets.ButtonBarLastButton_down;
import spark.skins.mobile480.assets.ButtonBarLastButton_selected;
import spark.skins.mobile480.assets.ButtonBarLastButton_up;
+import spark.skins.mobile640.assets.ButtonBarLastButton_down;
+import spark.skins.mobile640.assets.ButtonBarLastButton_selected;
+import spark.skins.mobile640.assets.ButtonBarLastButton_up;
/**
* Button skin for the last Button in a ButtonBar.
@@ -61,6 +67,16 @@ public class ButtonBarLastButtonSkin extends ButtonBarButtonSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ upBorderSkin = spark.skins.mobile640.assets.ButtonBarFirstButton_up;
+ downBorderSkin = spark.skins.mobile640.assets.ButtonBarFirstButton_down;
+ selectedBorderSkin = spark.skins.mobile640.assets.ButtonBarFirstButton_selected;
+
+ cornerRadius = 24;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
upBorderSkin = spark.skins.mobile480.assets.ButtonBarFirstButton_up;
@@ -81,16 +97,26 @@ public class ButtonBarLastButtonSkin extends ButtonBarButtonSkinBase
break;
}
- case DPIClassification.DPI_240:
- {
- upBorderSkin = spark.skins.mobile240.assets.ButtonBarLastButton_up;
- downBorderSkin = spark.skins.mobile240.assets.ButtonBarLastButton_down;
- selectedBorderSkin = spark.skins.mobile240.assets.ButtonBarLastButton_selected;
-
- cornerRadius = 8;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ upBorderSkin = spark.skins.mobile240.assets.ButtonBarLastButton_up;
+ downBorderSkin = spark.skins.mobile240.assets.ButtonBarLastButton_down;
+ selectedBorderSkin = spark.skins.mobile240.assets.ButtonBarLastButton_selected;
+
+ cornerRadius = 8;
+
+ break;
+ }
+ case DPIClassification.DPI_160:
+ {
+ upBorderSkin = spark.skins.mobile160.assets.ButtonBarLastButton_up;
+ downBorderSkin = spark.skins.mobile160.assets.ButtonBarLastButton_down;
+ selectedBorderSkin = spark.skins.mobile160.assets.ButtonBarLastButton_selected;
+
+ cornerRadius = 4;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarMiddleButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarMiddleButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarMiddleButtonSkin.as
index decc815..888820b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarMiddleButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonBarMiddleButtonSkin.as
@@ -22,6 +22,9 @@ package spark.skins.mobile
import mx.core.DPIClassification;
import spark.skins.mobile.supportClasses.ButtonBarButtonSkinBase;
+import spark.skins.mobile120.assets.ButtonBarMiddleButton_down;
+import spark.skins.mobile120.assets.ButtonBarMiddleButton_selected;
+import spark.skins.mobile120.assets.ButtonBarMiddleButton_up;
import spark.skins.mobile160.assets.ButtonBarMiddleButton_down;
import spark.skins.mobile160.assets.ButtonBarMiddleButton_selected;
import spark.skins.mobile160.assets.ButtonBarMiddleButton_up;
@@ -34,6 +37,9 @@ import spark.skins.mobile320.assets.ButtonBarMiddleButton_up;
import spark.skins.mobile480.assets.ButtonBarMiddleButton_down;
import spark.skins.mobile480.assets.ButtonBarMiddleButton_selected;
import spark.skins.mobile480.assets.ButtonBarMiddleButton_up;
+import spark.skins.mobile640.assets.ButtonBarMiddleButton_down;
+import spark.skins.mobile640.assets.ButtonBarMiddleButton_selected;
+import spark.skins.mobile640.assets.ButtonBarMiddleButton_up;
/**
* Button skin for middle Buttons in a ButtonBar.
@@ -61,14 +67,20 @@ public class ButtonBarMiddleButtonSkin extends ButtonBarButtonSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ upBorderSkin = spark.skins.mobile640.assets.ButtonBarMiddleButton_up;
+ downBorderSkin = spark.skins.mobile640.assets.ButtonBarMiddleButton_down;
+ selectedBorderSkin = spark.skins.mobile640.assets.ButtonBarMiddleButton_selected;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
upBorderSkin = spark.skins.mobile480.assets.ButtonBarFirstButton_up;
downBorderSkin = spark.skins.mobile480.assets.ButtonBarFirstButton_down;
selectedBorderSkin = spark.skins.mobile480.assets.ButtonBarFirstButton_selected;
-
- cornerRadius = 16;
-
+
break;
}
case DPIClassification.DPI_320:
@@ -79,14 +91,22 @@ public class ButtonBarMiddleButtonSkin extends ButtonBarButtonSkinBase
break;
}
- case DPIClassification.DPI_240:
- {
- upBorderSkin = spark.skins.mobile240.assets.ButtonBarMiddleButton_up;
- downBorderSkin = spark.skins.mobile240.assets.ButtonBarMiddleButton_down;
- selectedBorderSkin = spark.skins.mobile240.assets.ButtonBarMiddleButton_selected;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ upBorderSkin = spark.skins.mobile240.assets.ButtonBarMiddleButton_up;
+ downBorderSkin = spark.skins.mobile240.assets.ButtonBarMiddleButton_down;
+ selectedBorderSkin = spark.skins.mobile240.assets.ButtonBarMiddleButton_selected;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ upBorderSkin = spark.skins.mobile120.assets.ButtonBarMiddleButton_up;
+ downBorderSkin = spark.skins.mobile120.assets.ButtonBarMiddleButton_down;
+ selectedBorderSkin = spark.skins.mobile120.assets.ButtonBarMiddleButton_selected;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkin.as
index c7ec98a..22a0f4f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ButtonSkin.as
@@ -30,6 +30,8 @@ import mx.utils.ColorUtil;
import spark.components.supportClasses.StyleableTextField;
import spark.skins.mobile.supportClasses.ButtonSkinBase;
+import spark.skins.mobile120.assets.Button_down;
+import spark.skins.mobile120.assets.Button_up;
import spark.skins.mobile160.assets.Button_down;
import spark.skins.mobile160.assets.Button_up;
import spark.skins.mobile240.assets.Button_down;
@@ -38,6 +40,8 @@ import spark.skins.mobile320.assets.Button_down;
import spark.skins.mobile320.assets.Button_up;
import spark.skins.mobile480.assets.Button_down;
import spark.skins.mobile480.assets.Button_up;
+import spark.skins.mobile640.assets.Button_down;
+import spark.skins.mobile640.assets.Button_up;
use namespace mx_internal;
@@ -101,6 +105,23 @@ public class ButtonSkin extends ButtonSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ upBorderSkin = spark.skins.mobile640.assets.Button_up;
+ downBorderSkin = spark.skins.mobile640.assets.Button_down;
+
+ layoutGap = 20;
+ layoutCornerEllipseSize = 40;
+ layoutPaddingLeft = 40;
+ layoutPaddingRight = 40;
+ layoutPaddingTop = 40;
+ layoutPaddingBottom = 40;
+ layoutBorderSize = 2;
+ measuredDefaultWidth = 128;
+ measuredDefaultHeight = 172;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -136,23 +157,40 @@ public class ButtonSkin extends ButtonSkinBase
break;
}
- case DPIClassification.DPI_240:
- {
- upBorderSkin = spark.skins.mobile240.assets.Button_up;
- downBorderSkin = spark.skins.mobile240.assets.Button_down;
-
- layoutGap = 7;
- layoutCornerEllipseSize = 15;
- layoutPaddingLeft = 15;
- layoutPaddingRight = 15;
- layoutPaddingTop = 15;
- layoutPaddingBottom = 15;
- layoutBorderSize = 1;
- measuredDefaultWidth = 48;
- measuredDefaultHeight = 65;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ upBorderSkin = spark.skins.mobile240.assets.Button_up;
+ downBorderSkin = spark.skins.mobile240.assets.Button_down;
+
+ layoutGap = 7;
+ layoutCornerEllipseSize = 15;
+ layoutPaddingLeft = 15;
+ layoutPaddingRight = 15;
+ layoutPaddingTop = 15;
+ layoutPaddingBottom = 15;
+ layoutBorderSize = 1;
+ measuredDefaultWidth = 48;
+ measuredDefaultHeight = 65;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ upBorderSkin = spark.skins.mobile120.assets.Button_up;
+ downBorderSkin = spark.skins.mobile120.assets.Button_down;
+
+ layoutGap = 4;
+ layoutCornerEllipseSize = 8;
+ layoutPaddingLeft = 8;
+ layoutPaddingRight = 8;
+ layoutPaddingTop = 8;
+ layoutPaddingBottom = 8;
+ layoutBorderSize = 1;
+ measuredDefaultWidth = 24;
+ measuredDefaultHeight = 33;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutActionBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutActionBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutActionBarSkin.as
index ca55693..e130d0b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutActionBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutActionBarSkin.as
@@ -51,6 +51,11 @@ public class CalloutActionBarSkin extends ActionBarSkin
// shorten ActionBar height visual paddingTop comes from CalloutSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ layoutContentGroupHeight = 108;
+ break;
+ }
case DPIClassification.DPI_480:
{
layoutContentGroupHeight = 84;
@@ -61,11 +66,16 @@ public class CalloutActionBarSkin extends ActionBarSkin
layoutContentGroupHeight = 54;
break;
}
- case DPIClassification.DPI_240:
- {
- layoutContentGroupHeight = 42;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ layoutContentGroupHeight = 42;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ layoutContentGroupHeight = 21;
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
index d77686e..f69de0f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutSkin.as
@@ -41,10 +41,12 @@ import spark.effects.Fade;
import spark.primitives.RectangularDropShadow;
import spark.skins.mobile.supportClasses.CalloutArrow;
import spark.skins.mobile.supportClasses.MobileSkin;
+import spark.skins.mobile120.assets.CalloutContentBackground;
import spark.skins.mobile160.assets.CalloutContentBackground;
import spark.skins.mobile240.assets.CalloutContentBackground;
import spark.skins.mobile320.assets.CalloutContentBackground;
import spark.skins.mobile480.assets.CalloutContentBackground;
+import spark.skins.mobile640.assets.CalloutContentBackground;
use namespace mx_internal;
@@ -96,6 +98,23 @@ public class CalloutSkin extends MobileSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ // Note provisional may need changes
+ backgroundCornerRadius = 32;
+ contentBackgroundInsetClass = spark.skins.mobile640.assets.CalloutContentBackground;
+ backgroundGradientHeight = 440;
+ frameThickness = 32;
+ arrowWidth = 208;
+ arrowHeight = 104;
+ contentCornerRadius = 20;
+ dropShadowBlurX = 64;
+ dropShadowBlurY = 64;
+ dropShadowDistance = 12;
+ highlightWeight = 2;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -145,6 +164,22 @@ public class CalloutSkin extends MobileSkin
break;
}
+ case DPIClassification.DPI_120:
+ {
+ backgroundCornerRadius = 6;
+ contentBackgroundInsetClass = spark.skins.mobile120.assets.CalloutContentBackground;
+ backgroundGradientHeight = 83;
+ frameThickness = 24;
+ arrowWidth = 156;
+ arrowHeight = 39;
+ contentCornerRadius = 7;
+ dropShadowBlurX = 24;
+ dropShadowBlurY = 24;
+ dropShadowDistance = 4;
+ highlightWeight = 1;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutViewNavigatorSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutViewNavigatorSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutViewNavigatorSkin.as
index bb7a609..56727bb 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutViewNavigatorSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CalloutViewNavigatorSkin.as
@@ -26,10 +26,12 @@ import mx.core.DPIClassification;
import mx.core.mx_internal;
import spark.core.SpriteVisualElement;
+import spark.skins.mobile120.assets.CalloutContentBackground;
import spark.skins.mobile160.assets.CalloutContentBackground;
import spark.skins.mobile240.assets.CalloutContentBackground;
import spark.skins.mobile320.assets.CalloutContentBackground;
import spark.skins.mobile480.assets.CalloutContentBackground;
+import spark.skins.mobile640.assets.CalloutContentBackground;
use namespace mx_internal;
@@ -64,6 +66,13 @@ public class CalloutViewNavigatorSkin extends ViewNavigatorSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ contentBackgroundClass = spark.skins.mobile640.assets.CalloutContentBackground;
+ contentCornerRadius = 28;
+ gap = 48;
+ break;
+ }
case DPIClassification.DPI_480:
{
contentBackgroundClass = spark.skins.mobile480.assets.CalloutContentBackground;
@@ -78,13 +87,20 @@ public class CalloutViewNavigatorSkin extends ViewNavigatorSkin
gap = 16;
break;
}
- case DPIClassification.DPI_240:
- {
- contentBackgroundClass = spark.skins.mobile240.assets.CalloutContentBackground;
- contentCornerRadius = 7;
- gap = 12;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ contentBackgroundClass = spark.skins.mobile240.assets.CalloutContentBackground;
+ contentCornerRadius = 7;
+ gap = 12;
+ break;
+ }
+ case DPIClassification.DPI_240:
+ {
+ contentBackgroundClass = spark.skins.mobile240.assets.CalloutContentBackground;
+ contentCornerRadius = 4;
+ gap = 6;
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as
index 975c5a0..481a6b3 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/CheckBoxSkin.as
@@ -30,6 +30,12 @@ import spark.skins.mobile160.assets.CheckBox_downSymbolSelected;
import spark.skins.mobile160.assets.CheckBox_up;
import spark.skins.mobile160.assets.CheckBox_upSymbol;
import spark.skins.mobile160.assets.CheckBox_upSymbolSelected;
+import spark.skins.mobile160.assets.CheckBox_down;
+import spark.skins.mobile160.assets.CheckBox_downSymbol;
+import spark.skins.mobile160.assets.CheckBox_downSymbolSelected;
+import spark.skins.mobile160.assets.CheckBox_up;
+import spark.skins.mobile160.assets.CheckBox_upSymbol;
+import spark.skins.mobile160.assets.CheckBox_upSymbolSelected;
import spark.skins.mobile240.assets.CheckBox_down;
import spark.skins.mobile240.assets.CheckBox_downSymbol;
import spark.skins.mobile240.assets.CheckBox_downSymbolSelected;
@@ -48,6 +54,12 @@ import spark.skins.mobile480.assets.CheckBox_downSymbolSelected;
import spark.skins.mobile480.assets.CheckBox_up;
import spark.skins.mobile480.assets.CheckBox_upSymbol;
import spark.skins.mobile480.assets.CheckBox_upSymbolSelected;
+import spark.skins.mobile640.assets.CheckBox_down;
+import spark.skins.mobile640.assets.CheckBox_downSymbol;
+import spark.skins.mobile640.assets.CheckBox_downSymbolSelected;
+import spark.skins.mobile640.assets.CheckBox_up;
+import spark.skins.mobile640.assets.CheckBox_upSymbol;
+import spark.skins.mobile640.assets.CheckBox_upSymbolSelected;
/**
* ActionScript-based skin for CheckBox components in mobile applications.
@@ -94,6 +106,24 @@ public class CheckBoxSkin extends SelectableButtonSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ upIconClass = spark.skins.mobile640.assets.CheckBox_up;
+ upSelectedIconClass = spark.skins.mobile640.assets.CheckBox_up;
+ downIconClass = spark.skins.mobile640.assets.CheckBox_down;
+ downSelectedIconClass = spark.skins.mobile640.assets.CheckBox_down;
+ upSymbolIconClass = spark.skins.mobile640.assets.CheckBox_upSymbol;
+ upSymbolIconSelectedClass = spark.skins.mobile640.assets.CheckBox_upSymbolSelected;
+ downSymbolIconClass = spark.skins.mobile640.assets.CheckBox_downSymbol;
+ downSymbolIconSelectedClass = spark.skins.mobile640.assets.CheckBox_downSymbolSelected;
+
+ layoutGap = 40;
+ minWidth = 128;
+ minHeight = 128;
+ layoutBorderSize = 4;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -109,7 +139,7 @@ public class CheckBoxSkin extends SelectableButtonSkinBase
layoutGap = 30;
minWidth = 96;
minHeight = 96;
- layoutBorderSize = 8;
+ layoutBorderSize = 3;
break;
}
@@ -123,11 +153,11 @@ public class CheckBoxSkin extends SelectableButtonSkinBase
upSymbolIconSelectedClass = spark.skins.mobile320.assets.CheckBox_upSymbolSelected;
downSymbolIconClass = spark.skins.mobile320.assets.CheckBox_downSymbol;
downSymbolIconSelectedClass = spark.skins.mobile320.assets.CheckBox_downSymbolSelected;
-
+
layoutGap = 20;
minWidth = 64;
minHeight = 64;
- layoutBorderSize = 4;
+ layoutBorderSize = 3;
break;
}
@@ -149,6 +179,24 @@ public class CheckBoxSkin extends SelectableButtonSkinBase
break;
}
+ case DPIClassification.DPI_120:
+ {
+ upIconClass = spark.skins.mobile120.assets.CheckBox_up;
+ upSelectedIconClass = spark.skins.mobile120.assets.CheckBox_up;
+ downIconClass = spark.skins.mobile120.assets.CheckBox_down;
+ downSelectedIconClass = spark.skins.mobile120.assets.CheckBox_down;
+ upSymbolIconClass = spark.skins.mobile120.assets.CheckBox_upSymbol;
+ upSymbolIconSelectedClass = spark.skins.mobile120.assets.CheckBox_upSymbolSelected;
+ downSymbolIconClass = spark.skins.mobile120.assets.CheckBox_downSymbol;
+ downSymbolIconSelectedClass = spark.skins.mobile120.assets.CheckBox_downSymbolSelected;
+
+ layoutGap = 8;
+ minWidth = 24;
+ minHeight = 24;
+ layoutBorderSize = 1;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarSkin.as
index 44e682b..45d2980 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarSkin.as
@@ -64,6 +64,13 @@ public class HScrollBarSkin extends MobileSkin
// Depending on density set our measured height
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ minHeight = 24;
+ paddingBottom = HScrollBarThumbSkin.PADDING_BOTTOM_640DPI;
+ paddingHorizontal = HScrollBarThumbSkin.PADDING_HORIZONTAL_640DPI;
+ break;
+ }
case DPIClassification.DPI_480:
{
minHeight = 18;
@@ -78,13 +85,20 @@ public class HScrollBarSkin extends MobileSkin
paddingHorizontal = HScrollBarThumbSkin.PADDING_HORIZONTAL_320DPI;
break;
}
- case DPIClassification.DPI_240:
- {
- minHeight = 9;
- paddingBottom = HScrollBarThumbSkin.PADDING_BOTTOM_240DPI;
- paddingHorizontal = HScrollBarThumbSkin.PADDING_HORIZONTAL_240DPI;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ minHeight = 9;
+ paddingBottom = HScrollBarThumbSkin.PADDING_BOTTOM_240DPI;
+ paddingHorizontal = HScrollBarThumbSkin.PADDING_HORIZONTAL_240DPI;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ minHeight = 5;
+ paddingBottom = HScrollBarThumbSkin.PADDING_BOTTOM_120DPI;
+ paddingHorizontal = HScrollBarThumbSkin.PADDING_HORIZONTAL_120DPI;
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarThumbSkin.as
index 94e7a86..ebf8a49 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HScrollBarThumbSkin.as
@@ -49,12 +49,16 @@ public class HScrollBarThumbSkin extends MobileSkin
//--------------------------------------------------------------------------
// These constants are also accessed from HScrollBarSkin
+ mx_internal static const PADDING_BOTTOM_640DPI:int = 10;
+ mx_internal static const PADDING_HORIZONTAL_640DPI:int = 8;
mx_internal static const PADDING_BOTTOM_480DPI:int = 8;
mx_internal static const PADDING_HORIZONTAL_480DPI:int = 6;
mx_internal static const PADDING_BOTTOM_320DPI:int = 5;
mx_internal static const PADDING_HORIZONTAL_320DPI:int = 4;
- mx_internal static const PADDING_BOTTOM_240DPI:int = 4;
- mx_internal static const PADDING_HORIZONTAL_240DPI:int = 3;
+ mx_internal static const PADDING_BOTTOM_240DPI:int = 4;
+ mx_internal static const PADDING_HORIZONTAL_240DPI:int = 3;
+ mx_internal static const PADDING_BOTTOM_120DPI:int = 2;
+ mx_internal static const PADDING_HORIZONTAL_120DPI:int = 2;
mx_internal static const PADDING_BOTTOM_DEFAULTDPI:int = 3;
mx_internal static const PADDING_HORIZONTAL_DEFAULTDPI:int = 2;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderThumbSkin.as
index ae8c721..e87f919 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderThumbSkin.as
@@ -25,6 +25,8 @@ import mx.core.DPIClassification;
import spark.components.Button;
import spark.skins.mobile.supportClasses.MobileSkin;
+import spark.skins.mobile120.assets.HSliderThumb_normal;
+import spark.skins.mobile120.assets.HSliderThumb_pressed;
import spark.skins.mobile160.assets.HSliderThumb_normal;
import spark.skins.mobile160.assets.HSliderThumb_pressed;
import spark.skins.mobile240.assets.HSliderThumb_normal;
@@ -33,6 +35,8 @@ import spark.skins.mobile320.assets.HSliderThumb_normal;
import spark.skins.mobile320.assets.HSliderThumb_pressed;
import spark.skins.mobile480.assets.HSliderThumb_normal;
import spark.skins.mobile480.assets.HSliderThumb_pressed;
+import spark.skins.mobile640.assets.HSliderThumb_normal;
+import spark.skins.mobile640.assets.HSliderThumb_pressed;
/**
* ActionScript-based skin for the HSlider thumb skin part in mobile applications.
@@ -69,6 +73,24 @@ public class HSliderThumbSkin extends MobileSkin
// set the right assets and dimensions to use based on the screen density
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ thumbImageWidth = 116;
+ thumbImageHeight = 116;
+
+ thumbNormalClass = spark.skins.mobile640.assets.HSliderThumb_normal;
+ thumbPressedClass = spark.skins.mobile640.assets.HSliderThumb_pressed;
+
+ hitZoneOffset = 20;
+ hitZoneSideLength = 160;
+
+ // chromeColor ellipse goes up to the thumb border
+ chromeColorEllipseWidth = chromeColorEllipseHeight = 112;
+ chromeColorEllipseX = 1;
+ chromeColorEllipseY = 1;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -105,23 +127,40 @@ public class HSliderThumbSkin extends MobileSkin
break;
}
- case DPIClassification.DPI_240:
- {
- thumbImageWidth = 44;
- thumbImageHeight = 44;
-
- thumbNormalClass = spark.skins.mobile240.assets.HSliderThumb_normal;
- thumbPressedClass = spark.skins.mobile240.assets.HSliderThumb_pressed;
-
- hitZoneOffset = 10;
- hitZoneSideLength = 65;
-
- // chromeColor ellipse goes up to the thumb border
- chromeColorEllipseWidth = chromeColorEllipseHeight = 42;
- chromeColorEllipseX = chromeColorEllipseY = 1;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ thumbImageWidth = 44;
+ thumbImageHeight = 44;
+
+ thumbNormalClass = spark.skins.mobile240.assets.HSliderThumb_normal;
+ thumbPressedClass = spark.skins.mobile240.assets.HSliderThumb_pressed;
+
+ hitZoneOffset = 10;
+ hitZoneSideLength = 65;
+
+ // chromeColor ellipse goes up to the thumb border
+ chromeColorEllipseWidth = chromeColorEllipseHeight = 42;
+ chromeColorEllipseX = chromeColorEllipseY = 1;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ thumbImageWidth = 22;
+ thumbImageHeight = 22;
+
+ thumbNormalClass = spark.skins.mobile120.assets.HSliderThumb_normal;
+ thumbPressedClass = spark.skins.mobile120.assets.HSliderThumb_pressed;
+
+ hitZoneOffset = 5;
+ hitZoneSideLength = 33;
+
+ // chromeColor ellipse goes up to the thumb border
+ chromeColorEllipseWidth = chromeColorEllipseHeight = 21;
+ chromeColorEllipseX = chromeColorEllipseY = 1;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderTrackSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderTrackSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderTrackSkin.as
index dfd55b9..fe8398d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderTrackSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/HSliderTrackSkin.as
@@ -25,10 +25,12 @@ import mx.core.DPIClassification;
import spark.components.Button;
import spark.skins.mobile.supportClasses.MobileSkin;
+import spark.skins.mobile120.assets.HSliderTrack;
import spark.skins.mobile160.assets.HSliderTrack;
import spark.skins.mobile240.assets.HSliderTrack;
import spark.skins.mobile320.assets.HSliderTrack;
import spark.skins.mobile480.assets.HSliderTrack;
+import spark.skins.mobile640.assets.HSliderTrack;
/**
* ActionScript-based skin for the HSlider track skin part in mobile applications.
@@ -62,6 +64,18 @@ public class HSliderTrackSkin extends MobileSkin
// set the right assets and dimensions to use based on the screen density
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ // Note provisional may need changes
+ trackWidth = 1200;
+ trackHeight = 36;
+
+ visibleTrackOffset = 40;
+
+ trackClass = spark.skins.mobile640.assets.HSliderTrack;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -85,17 +99,28 @@ public class HSliderTrackSkin extends MobileSkin
break;
}
- case DPIClassification.DPI_240:
- {
- trackWidth = 440;
- trackHeight = 13;
-
- visibleTrackOffset = 16;
-
- trackClass = spark.skins.mobile240.assets.HSliderTrack;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ trackWidth = 440;
+ trackHeight = 13;
+
+ visibleTrackOffset = 16;
+
+ trackClass = spark.skins.mobile240.assets.HSliderTrack;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ trackWidth = 220;
+ trackHeight = 7;
+
+ visibleTrackOffset = 8;
+
+ trackClass = spark.skins.mobile120.assets.HSliderTrack;
+
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/ImageSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ImageSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ImageSkin.as
index a2d1be8..983d65e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ImageSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ImageSkin.as
@@ -29,10 +29,12 @@ import spark.components.Group;
import spark.components.Image;
import spark.primitives.BitmapImage;
import spark.skins.mobile.supportClasses.MobileSkin;
+import spark.skins.mobile120.assets.ImageInvalid;
import spark.skins.mobile160.assets.ImageInvalid;
import spark.skins.mobile240.assets.ImageInvalid;
import spark.skins.mobile320.assets.ImageInvalid;
import spark.skins.mobile480.assets.ImageInvalid;
+import spark.skins.mobile640.assets.ImageInvalid;
/**
* ActionScript-based skin for the Image component in mobile applications.
@@ -66,6 +68,11 @@ public class ImageSkin extends MobileSkin
// set the right assets and dimensions to use based on the screen density
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ imageInvalidClass = spark.skins.mobile640.assets.ImageInvalid;
+ break;
+ }
case DPIClassification.DPI_480:
{
imageInvalidClass = spark.skins.mobile480.assets.ImageInvalid;
@@ -76,11 +83,16 @@ public class ImageSkin extends MobileSkin
imageInvalidClass = spark.skins.mobile320.assets.ImageInvalid;
break;
}
- case DPIClassification.DPI_240:
- {
- imageInvalidClass = spark.skins.mobile240.assets.ImageInvalid;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ imageInvalidClass = spark.skins.mobile240.assets.ImageInvalid;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ imageInvalidClass = spark.skins.mobile120.assets.ImageInvalid;
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as
index ce1367b..e530204 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/RadioButtonSkin.as
@@ -25,6 +25,12 @@ import flash.display.DisplayObject;
import mx.core.DPIClassification;
import spark.skins.mobile.supportClasses.SelectableButtonSkinBase;
+import spark.skins.mobile120.assets.RadioButton_down;
+import spark.skins.mobile120.assets.RadioButton_downSymbol;
+import spark.skins.mobile120.assets.RadioButton_downSymbolSelected;
+import spark.skins.mobile120.assets.RadioButton_up;
+import spark.skins.mobile120.assets.RadioButton_upSymbol;
+import spark.skins.mobile120.assets.RadioButton_upSymbolSelected;
import spark.skins.mobile160.assets.RadioButton_down;
import spark.skins.mobile160.assets.RadioButton_downSymbol;
import spark.skins.mobile160.assets.RadioButton_downSymbolSelected;
@@ -49,6 +55,12 @@ import spark.skins.mobile480.assets.RadioButton_downSymbolSelected;
import spark.skins.mobile480.assets.RadioButton_up;
import spark.skins.mobile480.assets.RadioButton_upSymbol;
import spark.skins.mobile480.assets.RadioButton_upSymbolSelected;
+import spark.skins.mobile640.assets.RadioButton_down;
+import spark.skins.mobile640.assets.RadioButton_downSymbol;
+import spark.skins.mobile640.assets.RadioButton_downSymbolSelected;
+import spark.skins.mobile640.assets.RadioButton_up;
+import spark.skins.mobile640.assets.RadioButton_upSymbol;
+import spark.skins.mobile640.assets.RadioButton_upSymbolSelected;
/**
* ActionScript-based skin for RadioButton controls in mobile applications.
*
@@ -98,6 +110,23 @@ public class RadioButtonSkin extends SelectableButtonSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ upIconClass = spark.skins.mobile640.assets.RadioButton_up;
+ upSelectedIconClass = spark.skins.mobile640.assets.RadioButton_up;
+ downIconClass = spark.skins.mobile640.assets.RadioButton_down;
+ downSelectedIconClass = spark.skins.mobile640.assets.RadioButton_down;
+ upSymbolIconClass = spark.skins.mobile640.assets.RadioButton_upSymbol;
+ downSymbolIconClass = spark.skins.mobile640.assets.RadioButton_downSymbol;
+ upSymbolIconSelectedClass = spark.skins.mobile640.assets.RadioButton_upSymbolSelected;
+ downSymbolIconSelectedClass = spark.skins.mobile640.assets.RadioButton_downSymbolSelected;
+
+ layoutGap = 40;
+ minWidth = 128;
+ minHeight = 128;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -133,23 +162,40 @@ public class RadioButtonSkin extends SelectableButtonSkinBase
break;
}
- case DPIClassification.DPI_240:
- {
- upIconClass = spark.skins.mobile240.assets.RadioButton_up;
- upSelectedIconClass = spark.skins.mobile240.assets.RadioButton_up;
- downIconClass = spark.skins.mobile240.assets.RadioButton_down;
- downSelectedIconClass = spark.skins.mobile240.assets.RadioButton_down;
- upSymbolIconClass = spark.skins.mobile240.assets.RadioButton_upSymbol;
- downSymbolIconClass = spark.skins.mobile240.assets.RadioButton_downSymbol;
- upSymbolIconSelectedClass = spark.skins.mobile240.assets.RadioButton_upSymbolSelected;
- downSymbolIconSelectedClass = spark.skins.mobile240.assets.RadioButton_downSymbolSelected;
-
- layoutGap = 15;
- minWidth = 48;
- minHeight = 48;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ upIconClass = spark.skins.mobile240.assets.RadioButton_up;
+ upSelectedIconClass = spark.skins.mobile240.assets.RadioButton_up;
+ downIconClass = spark.skins.mobile240.assets.RadioButton_down;
+ downSelectedIconClass = spark.skins.mobile240.assets.RadioButton_down;
+ upSymbolIconClass = spark.skins.mobile240.assets.RadioButton_upSymbol;
+ downSymbolIconClass = spark.skins.mobile240.assets.RadioButton_downSymbol;
+ upSymbolIconSelectedClass = spark.skins.mobile240.assets.RadioButton_upSymbolSelected;
+ downSymbolIconSelectedClass = spark.skins.mobile240.assets.RadioButton_downSymbolSelected;
+
+ layoutGap = 15;
+ minWidth = 48;
+ minHeight = 48;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ upIconClass = spark.skins.mobile120.assets.RadioButton_up;
+ upSelectedIconClass = spark.skins.mobile120.assets.RadioButton_up;
+ downIconClass = spark.skins.mobile120.assets.RadioButton_down;
+ downSelectedIconClass = spark.skins.mobile120.assets.RadioButton_down;
+ upSymbolIconClass = spark.skins.mobile120.assets.RadioButton_upSymbol;
+ downSymbolIconClass = spark.skins.mobile120.assets.RadioButton_downSymbol;
+ upSymbolIconSelectedClass = spark.skins.mobile120.assets.RadioButton_upSymbolSelected;
+ downSymbolIconSelectedClass = spark.skins.mobile120.assets.RadioButton_downSymbolSelected;
+
+ layoutGap = 7;
+ minWidth = 24;
+ minHeight = 24;
+
+ break;
+ }
default:
{
upIconClass = spark.skins.mobile160.assets.RadioButton_up;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListContainerSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListContainerSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListContainerSkin.as
index e8717f4..a1dd77e 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListContainerSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListContainerSkin.as
@@ -28,6 +28,9 @@ import spark.components.Group;
import spark.components.SpinnerListContainer;
import spark.layouts.HorizontalLayout;
import spark.skins.mobile.supportClasses.MobileSkin;
+import spark.skins.mobile120.assets.SpinnerListContainerBackground;
+import spark.skins.mobile120.assets.SpinnerListContainerSelectionIndicator;
+import spark.skins.mobile120.assets.SpinnerListContainerShadow;
import spark.skins.mobile160.assets.SpinnerListContainerBackground;
import spark.skins.mobile160.assets.SpinnerListContainerSelectionIndicator;
import spark.skins.mobile160.assets.SpinnerListContainerShadow;
@@ -40,6 +43,9 @@ import spark.skins.mobile320.assets.SpinnerListContainerShadow;
import spark.skins.mobile480.assets.SpinnerListContainerBackground;
import spark.skins.mobile480.assets.SpinnerListContainerSelectionIndicator;
import spark.skins.mobile480.assets.SpinnerListContainerShadow;
+import spark.skins.mobile640.assets.SpinnerListContainerBackground;
+import spark.skins.mobile640.assets.SpinnerListContainerSelectionIndicator;
+import spark.skins.mobile640.assets.SpinnerListContainerShadow;
/**
* ActionScript-based skin for the SpinnerListContainer in mobile applications.
*
@@ -70,6 +76,18 @@ public class SpinnerListContainerSkin extends MobileSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ // Note provisional may need changes
+ borderClass = spark.skins.mobile640.assets.SpinnerListContainerBackground;
+ selectionIndicatorClass = spark.skins.mobile640.assets.SpinnerListContainerSelectionIndicator;
+ shadowClass = spark.skins.mobile40.assets.SpinnerListContainerShadow;
+
+ cornerRadius = 20;
+ borderThickness = 3;
+ selectionIndicatorHeight = 182;
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -93,17 +111,28 @@ public class SpinnerListContainerSkin extends MobileSkin
selectionIndicatorHeight = 96;
break;
}
- case DPIClassification.DPI_240:
- {
- borderClass = spark.skins.mobile240.assets.SpinnerListContainerBackground;
- selectionIndicatorClass = spark.skins.mobile240.assets.SpinnerListContainerSelectionIndicator;
- shadowClass = spark.skins.mobile240.assets.SpinnerListContainerShadow;
-
- cornerRadius = 8;
- borderThickness = 1;
- selectionIndicatorHeight = 72;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ borderClass = spark.skins.mobile240.assets.SpinnerListContainerBackground;
+ selectionIndicatorClass = spark.skins.mobile240.assets.SpinnerListContainerSelectionIndicator;
+ shadowClass = spark.skins.mobile240.assets.SpinnerListContainerShadow;
+
+ cornerRadius = 8;
+ borderThickness = 1;
+ selectionIndicatorHeight = 72;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ borderClass = spark.skins.mobile120.assets.SpinnerListContainerBackground;
+ selectionIndicatorClass = spark.skins.mobile120.assets.SpinnerListContainerSelectionIndicator;
+ shadowClass = spark.skins.mobile10.assets.SpinnerListContainerShadow;
+
+ cornerRadius = 4;
+ borderThickness = 1;
+ selectionIndicatorHeight = 37;
+ break;
+ }
default: // default DPI_160
{
borderClass = spark.skins.mobile160.assets.SpinnerListContainerBackground;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListSkin.as
index 45a2626..4bda8ec 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/SpinnerListSkin.as
@@ -55,6 +55,7 @@ public class SpinnerListSkin extends MobileSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
case DPIClassification.DPI_480:
case DPIClassification.DPI_320:
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/StageTextAreaSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/StageTextAreaSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/StageTextAreaSkin.as
index e4e926b..729eef9 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/StageTextAreaSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/StageTextAreaSkin.as
@@ -78,6 +78,11 @@ public class StageTextAreaSkin extends StageTextSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ measuredDefaultHeight = 212;
+ break;
+ }
case DPIClassification.DPI_480:
{
measuredDefaultHeight = 140;
@@ -88,11 +93,16 @@ public class StageTextAreaSkin extends StageTextSkinBase
measuredDefaultHeight = 106;
break;
}
- case DPIClassification.DPI_240:
- {
- measuredDefaultHeight = 70;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ measuredDefaultHeight = 70;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ measuredDefaultHeight = 35;
+ break;
+ }
default:
{
measuredDefaultHeight = 53;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarFirstTabSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarFirstTabSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarFirstTabSkin.as
index 998e103..781fc3b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarFirstTabSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarFirstTabSkin.as
@@ -28,6 +28,8 @@ import spark.skins.mobile320.assets.TabbedViewNavigatorButtonBarFirstButton_down
import spark.skins.mobile320.assets.TabbedViewNavigatorButtonBarFirstButton_up;
import spark.skins.mobile480.assets.TabbedViewNavigatorButtonBarFirstButton_down;
import spark.skins.mobile480.assets.TabbedViewNavigatorButtonBarFirstButton_up;
+import spark.skins.mobile640.assets.TabbedViewNavigatorButtonBarFirstButton_down;
+import spark.skins.mobile640.assets.TabbedViewNavigatorButtonBarFirstButton_up;
/**
* Skin for the left-most button in the TabbedViewNavigator ButtonBar skin
@@ -54,6 +56,12 @@ public class TabbedViewNavigatorTabBarFirstTabSkin extends TabbedViewNavigatorTa
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ upBorderSkin = spark.skins.mobile640.assets.TabbedViewNavigatorButtonBarFirstButton_up;
+ downBorderSkin = spark.skins.mobile640.assets.TabbedViewNavigatorButtonBarFirstButton_down;
+ selectedBorderSkin = spark.skins.mobile640.assets.TabbedViewNavigatorButtonBarFirstButton_selected;
+
case DPIClassification.DPI_480:
{
upBorderSkin = spark.skins.mobile480.assets.TabbedViewNavigatorButtonBarFirstButton_up;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarLastTabSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarLastTabSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarLastTabSkin.as
index 46efb67..90ae7ae 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarLastTabSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TabbedViewNavigatorTabBarLastTabSkin.as
@@ -28,6 +28,8 @@ import spark.skins.mobile320.assets.TabbedViewNavigatorButtonBarLastButton_down;
import spark.skins.mobile320.assets.TabbedViewNavigatorButtonBarLastButton_up;
import spark.skins.mobile480.assets.TabbedViewNavigatorButtonBarLastButton_down;
import spark.skins.mobile480.assets.TabbedViewNavigatorButtonBarLastButton_up;
+import spark.skins.mobile640.assets.TabbedViewNavigatorButtonBarLastButton_down;
+import spark.skins.mobile640.assets.TabbedViewNavigatorButtonBarLastButton_up;
/**
* Skin for used for middle and the right-most ButtonBarButton in the
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarSkin.as
index 28e9582..e029621 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarSkin.as
@@ -52,6 +52,13 @@ public class TextAreaHScrollBarSkin extends HScrollBarSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ minHeight = 30;
+ paddingBottom = TextAreaHScrollBarThumbSkin.PADDING_BOTTOM_320DPI;
+ paddingHorizontal = TextAreaHScrollBarThumbSkin.PADDING_HORIZONTAL_320DPI;
+ break;
+ }
case DPIClassification.DPI_480:
{
minHeight = 22;
@@ -66,13 +73,20 @@ public class TextAreaHScrollBarSkin extends HScrollBarSkin
paddingHorizontal = TextAreaHScrollBarThumbSkin.PADDING_HORIZONTAL_320DPI;
break;
}
- case DPIClassification.DPI_240:
- {
- minHeight = 11;
- paddingBottom = TextAreaHScrollBarThumbSkin.PADDING_BOTTOM_240DPI;
- paddingHorizontal = TextAreaHScrollBarThumbSkin.PADDING_HORIZONTAL_240DPI;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ minHeight = 11;
+ paddingBottom = TextAreaHScrollBarThumbSkin.PADDING_BOTTOM_240DPI;
+ paddingHorizontal = TextAreaHScrollBarThumbSkin.PADDING_HORIZONTAL_240DPI;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ minHeight = 11;
+ paddingBottom = TextAreaHScrollBarThumbSkin.PADDING_BOTTOM_120DPI;
+ paddingHorizontal = TextAreaHScrollBarThumbSkin.PADDING_HORIZONTAL_120DPI;
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarThumbSkin.as
index 83b2025..2375342 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaHScrollBarThumbSkin.as
@@ -41,12 +41,16 @@ public class TextAreaHScrollBarThumbSkin extends HScrollBarThumbSkin
//--------------------------------------------------------------------------
// These constants are also accessed from HScrollBarSkin
+ mx_internal static const PADDING_BOTTOM_640DPI:int = 16;
+ mx_internal static const PADDING_HORIZONTAL_640DPI:int = 16;
mx_internal static const PADDING_BOTTOM_480DPI:int = 12;
mx_internal static const PADDING_HORIZONTAL_480DPI:int = 12;
mx_internal static const PADDING_BOTTOM_320DPI:int = 8;
mx_internal static const PADDING_HORIZONTAL_320DPI:int = 12;
- mx_internal static const PADDING_BOTTOM_240DPI:int = 6;
- mx_internal static const PADDING_HORIZONTAL_240DPI:int = 6;
+ mx_internal static const PADDING_BOTTOM_240DPI:int = 6;
+ mx_internal static const PADDING_HORIZONTAL_240DPI:int = 6;
+ mx_internal static const PADDING_BOTTOM_120DPI:int = 3;
+ mx_internal static const PADDING_HORIZONTAL_120DPI:int = 3;
mx_internal static const PADDING_BOTTOM_DEFAULTDPI:int = 4;
mx_internal static const PADDING_HORIZONTAL_DEFAULTDPI:int = 6;
@@ -70,9 +74,14 @@ public class TextAreaHScrollBarThumbSkin extends HScrollBarThumbSkin
// Depending on density set padding
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ paddingBottom = PADDING_BOTTOM_640DPI;
+ paddingHorizontal = PADDING_HORIZONTAL_640DPI;
+ break;
+ }
case DPIClassification.DPI_480:
{
- minHeight = 11;
paddingBottom = TextAreaHScrollBarThumbSkin.PADDING_BOTTOM_480DPI;
paddingHorizontal = TextAreaHScrollBarThumbSkin.PADDING_HORIZONTAL_480DPI;
break;
@@ -83,12 +92,18 @@ public class TextAreaHScrollBarThumbSkin extends HScrollBarThumbSkin
paddingHorizontal = PADDING_HORIZONTAL_320DPI;
break;
}
- case DPIClassification.DPI_240:
- {
- paddingBottom = PADDING_BOTTOM_240DPI;
- paddingHorizontal = PADDING_HORIZONTAL_240DPI;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ paddingBottom = PADDING_BOTTOM_240DPI;
+ paddingHorizontal = PADDING_HORIZONTAL_240DPI;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ paddingBottom = PADDING_BOTTOM_120DPI;
+ paddingHorizontal = PADDING_HORIZONTAL_120DPI;
+ break;
+ }
default:
{
paddingBottom = PADDING_BOTTOM_DEFAULTDPI;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaSkin.as
index c553ec5..6ac6a67 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaSkin.as
@@ -42,10 +42,12 @@ import spark.components.TextArea;
import spark.components.supportClasses.StyleableTextField;
import spark.events.CaretBoundsChangeEvent;
import spark.skins.mobile.supportClasses.TextSkinBase;
+import spark.skins.mobile120.assets.TextInput_border;
import spark.skins.mobile160.assets.TextInput_border;
import spark.skins.mobile240.assets.TextInput_border;
import spark.skins.mobile320.assets.TextInput_border;
import spark.skins.mobile480.assets.TextInput_border;
+import spark.skins.mobile640.assets.TextInput_border;
use namespace mx_internal;
@@ -104,6 +106,16 @@ public class TextAreaSkin extends TextSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ borderClass = spark.skins.mobile640.assets.TextInput_border;
+ layoutCornerEllipseSize = 48;
+ measuredDefaultWidth = 1024;
+ measuredDefaultHeight = 212;
+ layoutBorderSize = 2;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -125,16 +137,26 @@ public class TextAreaSkin extends TextSkinBase
break;
}
- case DPIClassification.DPI_240:
- {
- borderClass = spark.skins.mobile240.assets.TextInput_border;
- layoutCornerEllipseSize = 12;
- measuredDefaultWidth = 440;
- measuredDefaultHeight = 70;
- layoutBorderSize = 1;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ borderClass = spark.skins.mobile240.assets.TextInput_border;
+ layoutCornerEllipseSize = 12;
+ measuredDefaultWidth = 440;
+ measuredDefaultHeight = 70;
+ layoutBorderSize = 1;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ borderClass = spark.skins.mobile120.assets.TextInput_border;
+ layoutCornerEllipseSize = 6;
+ measuredDefaultWidth = 220;
+ measuredDefaultHeight = 35;
+ layoutBorderSize = 1;
+
+ break;
+ }
default:
{
borderClass = spark.skins.mobile160.assets.TextInput_border;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarSkin.as
index 3cc4004..ae52698 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarSkin.as
@@ -52,6 +52,13 @@ public class TextAreaVScrollBarSkin extends VScrollBarSkin
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ minWidth = 30;
+ paddingRight = TextAreaVScrollBarThumbSkin.PADDING_RIGHT_640DPI;
+ paddingVertical = TextAreaVScrollBarThumbSkin.PADDING_VERTICAL_640DPI;
+ break;
+ }
case DPIClassification.DPI_480:
{
minWidth = 22;
@@ -66,13 +73,20 @@ public class TextAreaVScrollBarSkin extends VScrollBarSkin
paddingVertical = TextAreaVScrollBarThumbSkin.PADDING_VERTICAL_320DPI;
break;
}
- case DPIClassification.DPI_240:
- {
- minWidth = 11;
- paddingRight = TextAreaVScrollBarThumbSkin.PADDING_RIGHT_240DPI;
- paddingVertical = TextAreaVScrollBarThumbSkin.PADDING_VERTICAL_240DPI;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ minWidth = 11;
+ paddingRight = TextAreaVScrollBarThumbSkin.PADDING_RIGHT_240DPI;
+ paddingVertical = TextAreaVScrollBarThumbSkin.PADDING_VERTICAL_240DPI;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ minWidth = 6;
+ paddingRight = TextAreaVScrollBarThumbSkin.PADDING_RIGHT_120DPI;
+ paddingVertical = TextAreaVScrollBarThumbSkin.PADDING_VERTICAL_120DPI;
+ break;
+ }
default:
{
// default DPI_160
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarThumbSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarThumbSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarThumbSkin.as
index 9b188f9..ce9ceb4 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarThumbSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextAreaVScrollBarThumbSkin.as
@@ -41,12 +41,16 @@ public class TextAreaVScrollBarThumbSkin extends VScrollBarThumbSkin
//--------------------------------------------------------------------------
// These constants are also accessed from TextAreaVScrollBarSkin
+ mx_internal static const PADDING_RIGHT_640DPI:int = 16;
+ mx_internal static const PADDING_VERTICAL_640DPI:int = 24;
mx_internal static const PADDING_RIGHT_480DPI:int = 12;
- mx_internal static const PADDING_VERTICAL_480DPI:int = 12;
+ mx_internal static const PADDING_VERTICAL_480DPI:int = 18;
mx_internal static const PADDING_RIGHT_320DPI:int = 8;
mx_internal static const PADDING_VERTICAL_320DPI:int = 12;
- mx_internal static const PADDING_RIGHT_240DPI:int = 6;
- mx_internal static const PADDING_VERTICAL_240DPI:int = 6;
+ mx_internal static const PADDING_RIGHT_240DPI:int = 4;
+ mx_internal static const PADDING_VERTICAL_240DPI:int = 6;
+ mx_internal static const PADDING_RIGHT_240DPI:int = 2;
+ mx_internal static const PADDING_VERTICAL_240DPI:int = 3;
mx_internal static const PADDING_RIGHT_DEFAULTDPI:int = 4;
mx_internal static const PADDING_VERTICAL_DEFAULTDPI:int = 6;
@@ -71,6 +75,12 @@ public class TextAreaVScrollBarThumbSkin extends VScrollBarThumbSkin
// Depending on density set padding
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ paddingRight = PADDING_RIGHT_640DPI;
+ paddingVertical = PADDING_VERTICAL_640DPI;
+ break;
+ }
case DPIClassification.DPI_480:
{
paddingRight = PADDING_RIGHT_480DPI;
@@ -83,12 +93,18 @@ public class TextAreaVScrollBarThumbSkin extends VScrollBarThumbSkin
paddingVertical = PADDING_VERTICAL_320DPI;
break;
}
- case DPIClassification.DPI_240:
- {
- paddingRight = PADDING_RIGHT_240DPI;
- paddingVertical = PADDING_VERTICAL_240DPI;
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ paddingRight = PADDING_RIGHT_240DPI;
+ paddingVertical = PADDING_VERTICAL_240DPI;
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ paddingRight = PADDING_RIGHT_120DPI;
+ paddingVertical = PADDING_VERTICAL_120DPI;
+ break;
+ }
default:
{
paddingRight = PADDING_RIGHT_DEFAULTDPI;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/07289a63/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as
index 667c853..98d5def 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/TextInputSkin.as
@@ -31,10 +31,12 @@ import mx.events.FlexEvent;
import spark.components.TextInput;
import spark.components.supportClasses.StyleableTextField;
import spark.skins.mobile.supportClasses.TextSkinBase;
+import spark.skins.mobile120.assets.TextInput_border;
import spark.skins.mobile160.assets.TextInput_border;
import spark.skins.mobile240.assets.TextInput_border;
import spark.skins.mobile320.assets.TextInput_border;
import spark.skins.mobile480.assets.TextInput_border;
+import spark.skins.mobile640.assets.TextInput_border;
use namespace mx_internal;
@@ -73,6 +75,16 @@ public class TextInputSkin extends TextSkinBase
switch (applicationDPI)
{
+ case DPIClassification.DPI_640:
+ {
+ borderClass = spark.skins.mobile640.assets.TextInput_border;
+ layoutCornerEllipseSize = 48;
+ measuredDefaultWidth = 1200;
+ measuredDefaultHeight = 172;
+ layoutBorderSize = 3;
+
+ break;
+ }
case DPIClassification.DPI_480:
{
// Note provisional may need changes
@@ -94,16 +106,26 @@ public class TextInputSkin extends TextSkinBase
break;
}
- case DPIClassification.DPI_240:
- {
- borderClass = spark.skins.mobile240.assets.TextInput_border;
- layoutCornerEllipseSize = 12;
- measuredDefaultWidth = 440;
- measuredDefaultHeight = 50;
- layoutBorderSize = 1;
-
- break;
- }
+ case DPIClassification.DPI_240:
+ {
+ borderClass = spark.skins.mobile240.assets.TextInput_border;
+ layoutCornerEllipseSize = 12;
+ measuredDefaultWidth = 440;
+ measuredDefaultHeight = 50;
+ layoutBorderSize = 1;
+
+ break;
+ }
+ case DPIClassification.DPI_120:
+ {
+ borderClass = spark.skins.mobile120.assets.TextInput_border;
+ layoutCornerEllipseSize = 6;
+ measuredDefaultWidth = 220;
+ measuredDefaultHeight = 25;
+ layoutBorderSize = 1;
+
+ break;
+ }
default:
{
borderClass = spark.skins.mobile160.assets.TextInput_border;