incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r1409851 [3/3] - in /incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button: events/ events/baselines/ integration/ integration/baselines/ properties/ properties/baselines/ regression/ regression/baselines/ styles/ styl...
Date Thu, 15 Nov 2012 15:57:02 GMT
Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_default@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_default%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_inline@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_inline%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left_explicitHeight@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left_explicitHeight%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left_label_noIcon@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left_label_noIcon%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left_to_top@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_left_to_top%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_right@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_right%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_right_explicitHeight@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_right_explicitHeight%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_right_label_noIcon@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_right_label_noIcon%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_setStyle@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_setStyle%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_top@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_top%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_top_explicitHeight@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_top_explicitHeight%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_top_label_noIcon@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_iconPlacement_top_label_noIcon%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_chromeColor_down@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_chromeColor_down%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_chromeColor_up@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_chromeColor_up%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_css_styleName@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_css_styleName%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_custom_downSkin@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_custom_downSkin%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_custom_upSkin@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_custom_upSkin%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_bottom@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_bottom%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_left@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_left%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_right@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_right%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_top@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_iconPlacement_top%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_chromeColor_disabled@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_chromeColor_disabled%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_chromeColor_disabled@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_chromeColor_disabled%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_chromeColor_down@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_chromeColor_down%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_chromeColor_up@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_chromeColor_up%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_color@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_color%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_decrease_letterSpacing@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_decrease_letterSpacing%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontFamily@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontFamily%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontFamily_down@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontFamily_down%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontSize@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontSize%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontSize_down@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontSize_down%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontStyle@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontStyle%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontStyle_dowwn@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontStyle_dowwn%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontWeight@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontWeight%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontWeight_down@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_fontWeight_down%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_increase_letterSpacing@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_increase_letterSpacing%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_textDecoration@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_textDecoration%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_textDecoration_down@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/baselines/mobile_button_icon_with_label_textDecoration_down%40android_240ppi.png?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_icon_styles.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_icon_styles.mxml?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_icon_styles.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_icon_styles.mxml Thu Nov 15 15:56:41 2012
@@ -77,7 +77,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -94,7 +94,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -112,7 +112,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -132,7 +132,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -152,7 +152,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -171,7 +171,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -190,7 +190,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -209,7 +209,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -228,7 +228,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -247,7 +247,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -266,7 +266,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -285,7 +285,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -306,7 +306,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -326,7 +326,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -346,7 +346,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -368,7 +368,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -388,7 +388,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -409,7 +409,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -433,7 +433,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -452,7 +452,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="16" />
 			<ConditionalValue deviceDensity="240" os="android" value="24" />
 			<ConditionalValue deviceDensity="320" os="win" value="32"/>
-			<ConditionalValue deviceDensity="320" os="iphone" value="32"/>
+			<ConditionalValue deviceDensity="320" os="ios" value="32"/>
 			<ConditionalValue deviceDensity="160" os="qnx" value="16" />
 		</AssertStyleValue>
 		<SetStyle target="btn1" styleName="fontSize" value="26" waitEvent="updateComplete" waitTarget="btn1"/>
@@ -461,7 +461,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-			<ConditionalValue deviceDensity="320" os="iphone" />
+			<ConditionalValue deviceDensity="320" os="ios" />
 			<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -479,7 +479,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="16" />
 			<ConditionalValue deviceDensity="240" os="android" value="24" />
 			<ConditionalValue deviceDensity="320" os="win" value="32"/>
-			<ConditionalValue deviceDensity="320" os="iphone" value="32"/>
+			<ConditionalValue deviceDensity="320" os="ios" value="32"/>
 			<ConditionalValue deviceDensity="160" os="qnx" value="16" />
 		</AssertStyleValue>		
 		<SetStyle target="btn1" styleName="fontSize" value="26" waitEvent="updateComplete" waitTarget="btn1"/>
@@ -491,7 +491,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-			<ConditionalValue deviceDensity="320" os="iphone" />
+			<ConditionalValue deviceDensity="320" os="ios" />
 			<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -513,7 +513,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -537,7 +537,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -559,7 +559,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -583,7 +583,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -605,7 +605,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -629,7 +629,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -649,7 +649,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -671,7 +671,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -691,7 +691,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -709,7 +709,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -730,7 +730,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -749,7 +749,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -769,7 +769,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -791,7 +791,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -813,7 +813,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -834,7 +834,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -856,7 +856,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -875,7 +875,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-			<ConditionalValue deviceDensity="320" os="iphone" />
+			<ConditionalValue deviceDensity="320" os="ios" />
 			<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -897,7 +897,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="btn1" type="mouseUp" localX="26" localY="43" waitEvent="mouseUp" />
@@ -918,7 +918,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -941,7 +941,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -964,7 +964,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -986,7 +986,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1009,7 +1009,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1030,7 +1030,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1052,7 +1052,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1074,7 +1074,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1096,7 +1096,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1115,14 +1115,14 @@
 			<ConditionalValue deviceDensity="160" os="win" value="44" />
 			<ConditionalValue deviceDensity="240" os="android" value="66" />
 			<ConditionalValue deviceDensity="320" os="win" value="88" />
-			<ConditionalValue deviceDensity="320" os="iphone" value="88" />
+			<ConditionalValue deviceDensity="320" os="ios" value="88" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="44" />
 		</AssertPropertyValue>
 		<AssertStyleValue target="grp1" styleName="fontSize">
 			<ConditionalValue deviceDensity="160" os="win" value="16" />
 			<ConditionalValue deviceDensity="240" os="android" value="24" />
 			<ConditionalValue deviceDensity="320" os="win" value="32" />
-			<ConditionalValue deviceDensity="320" os="iphone" value="32" />
+			<ConditionalValue deviceDensity="320" os="ios" value="32" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="16" />
 		</AssertStyleValue>		
 		<SetStyle target="grp1" styleName="fontSize" value="28" waitEvent="updateComplete" waitTarget="grp1"/>
@@ -1130,7 +1130,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="44" />
 			<ConditionalValue deviceDensity="240" os="android" value="66" />
 			<ConditionalValue deviceDensity="320" os="win" value="88"/>
-			<ConditionalValue deviceDensity="320" os="iphone" value="88" />
+			<ConditionalValue deviceDensity="320" os="ios" value="88" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="44" />
 		</AssertPropertyValue>
 	</body>
@@ -1149,7 +1149,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="44" />
 			<ConditionalValue deviceDensity="240" os="android" value="66" />
 			<ConditionalValue deviceDensity="320" os="win" value="88"/>
-			<ConditionalValue deviceDensity="320" os="iphone" value="88" />
+			<ConditionalValue deviceDensity="320" os="ios" value="88" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="44" />
 		</AssertPropertyValue>		
 		<SetStyle target="grp1" styleName="fontSize" value="14" waitEvent="updateComplete" waitTarget="grp1"/>
@@ -1157,7 +1157,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="44" />
 			<ConditionalValue deviceDensity="240" os="android" value="66" />
 			<ConditionalValue deviceDensity="320" os="win" value="88"/>
-			<ConditionalValue deviceDensity="320" os="iphone" value="88" />
+			<ConditionalValue deviceDensity="320" os="ios" value="88" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="44" />
 		</AssertPropertyValue>		
 	</body>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles.mxml Thu Nov 15 15:56:41 2012
@@ -91,7 +91,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -109,7 +109,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -127,7 +127,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 
@@ -147,7 +147,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -164,7 +164,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -182,7 +182,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -202,7 +202,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -223,7 +223,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -244,7 +244,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -267,7 +267,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -288,7 +288,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -310,7 +310,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -329,7 +329,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -348,7 +348,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -367,7 +367,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -387,7 +387,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -405,7 +405,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -424,7 +424,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -442,7 +442,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -459,7 +459,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -485,7 +485,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -511,7 +511,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -528,7 +528,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -546,7 +546,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -563,7 +563,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -580,7 +580,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -608,7 +608,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -626,7 +626,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -643,7 +643,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>		
 	</body>
@@ -681,7 +681,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -699,7 +699,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -715,7 +715,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="16" />
 			<ConditionalValue deviceDensity="240" os="android" value="24" />
 			<ConditionalValue deviceDensity="320" os="win" value="32" />
-			<ConditionalValue deviceDensity="320" os="iphone" value="32" />
+			<ConditionalValue deviceDensity="320" os="ios" value="32" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="16" />
 		</AssertStyleValue>
 	</body>
@@ -733,7 +733,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -751,7 +751,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -780,7 +780,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -799,7 +799,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -818,7 +818,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -834,7 +834,7 @@
 					<ConditionalValue deviceDensity="160" os="win" />
 					<ConditionalValue deviceDensity="240" os="android" />
 					<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -859,7 +859,7 @@
 					<ConditionalValue deviceDensity="160" os="win" />
 					<ConditionalValue deviceDensity="240" os="android" />
 					<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -876,7 +876,7 @@
 					<ConditionalValue deviceDensity="160" os="win" />
 					<ConditionalValue deviceDensity="240" os="android" />
 					<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -898,7 +898,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="27" localY="16" waitEvent="mouseUp" />
@@ -920,7 +920,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -938,7 +938,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -957,7 +957,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -975,7 +975,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -993,7 +993,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1018,7 +1018,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1049,7 +1049,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1070,7 +1070,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1092,7 +1092,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -1112,7 +1112,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1133,7 +1133,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		
@@ -1156,7 +1156,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -1176,7 +1176,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1196,7 +1196,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1218,7 +1218,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -1240,7 +1240,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1264,7 +1264,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />
@@ -1287,7 +1287,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1306,7 +1306,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1326,7 +1326,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1342,7 +1342,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="2" />
 			<ConditionalValue deviceDensity="240" os="android" value="3" />
 			<ConditionalValue deviceDensity="320" os="win" value="3" />
-			<ConditionalValue deviceDensity="320" os="iphone" value="3" />
+			<ConditionalValue deviceDensity="320" os="ios" value="3" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="2" />
 		</AssertStyleValue>
 		<AssertStyleValue target="stylesRoot.bOne" styleName="focusBlendMode" value="normal" />	
@@ -1353,7 +1353,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1373,7 +1373,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1393,7 +1393,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1413,7 +1413,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1433,7 +1433,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1453,7 +1453,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />		
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1473,7 +1473,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1502,7 +1502,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>		
 	</body>
@@ -1519,7 +1519,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>		
 	</body>
@@ -1538,7 +1538,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1555,7 +1555,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>		
 	</body>
@@ -1572,7 +1572,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>		
 	</body>
@@ -1592,7 +1592,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -1614,7 +1614,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="stylesRoot.b_skin_normal" type="mouseUp" localX="35" localY="14" waitEvent="mouseUp" />		
@@ -1635,7 +1635,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles_css.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles_css.mxml?rev=1409851&r1=1409850&r2=1409851&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles_css.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Button/styles/button_styles_css.mxml Thu Nov 15 15:56:41 2012
@@ -41,7 +41,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -57,7 +57,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 		<DispatchMouseEvent target="firstB" type="mouseUp" localX="57" localY="19" waitEvent="mouseUp" />
@@ -72,7 +72,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -85,7 +85,7 @@
 			<ConditionalValue deviceDensity="160" os="win" value="16" />
 			<ConditionalValue deviceDensity="240" os="android" value="24" />
 			<ConditionalValue deviceDensity="320" os="win" value="32" />
-			<ConditionalValue deviceDensity="320" os="iphone" value="32" />
+			<ConditionalValue deviceDensity="320" os="ios" value="32" />
 			<ConditionalValue deviceDensity="160" os="qnx" value="16" />
 		</AssertStyleValue>
 		<AssertStyleValue target="thirdB" styleName="fontWeight" value="bold" />
@@ -93,7 +93,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-			<ConditionalValue deviceDensity="320" os="iphone" />
+			<ConditionalValue deviceDensity="320" os="ios" />
 			<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>
@@ -111,7 +111,7 @@
 			<ConditionalValue deviceDensity="160" os="win" />
 			<ConditionalValue deviceDensity="240" os="android" />
 			<ConditionalValue deviceDensity="320" os="win" />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 		</CompareBitmap>
 	</body>



Mime
View raw message