incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r1411438 [1/2] - in /incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar: integration/ integration/baselines/ methods/ methods/baselines/ properties/ properties/baselines/ styles/ styles/baselines/
Date Mon, 19 Nov 2012 21:42:36 GMT
Author: pent
Date: Mon Nov 19 21:42:28 2012
New Revision: 1411438

URL: http://svn.apache.org/viewvc?rev=1411438&view=rev
Log:
New baselines for new images and fonts.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/ButtonBar_ContainerIntegration.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_box_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_box_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_panel_test5@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_popup_test6@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_buttonBar_keyDownHandler.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_defaultButtonBarItemRendererFunction.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test10@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test11@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test12@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test3@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test4@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test5@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test6@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test7@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test8@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test9@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/customSkinSanityCheck@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_enabled.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_icon_properties.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_properties.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_selectedItem.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_fxg@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test10@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test11@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test12@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test13@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test14@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test15@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test16@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test17@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test18@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test19@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test20@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test21@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test22@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test23@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test24@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test25@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test26@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test27@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test28@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test29@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test3@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test4@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test5@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test6@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test7@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test8@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test9@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/enabled_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/selectedItem_sanityTest@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/ButtonBar_GlobalStyles_tester.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/ButtonBar_styles.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_baseColor_as@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_baseColor_disabled@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_baseColor_mouseOver@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_baseColor_mxml@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_color_as@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_color_disabled@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_color_mxml@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/ButtonBar_Style_focusColor_mxml@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/color_as_css_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/color_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/color_mxml_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontFamily_as_css_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontFamily_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontFamily_mxml_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontSize_as_css_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontSize_as_css_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontSize_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontSize_as_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontSize_mxml_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontSize_mxml_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontWeight_as_css_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontWeight_as_css_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontWeight_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontWeight_as_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontWeight_mxml_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/fontWeight_mxml_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_as_css_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_as_css_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_as_css_test3@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_as_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_as_test3@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_mxml_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_mxml_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/kerning_mxml_test3@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/lineThrough_as_css_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/lineThrough_as_css_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/lineThrough_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/lineThrough_as_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/lineThrough_mxml_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/lineThrough_mxml_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/tblr_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/tblr_as_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/tblr_as_test3@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/textDecoration_as_css_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/textDecoration_as_css_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/textDecoration_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/textDecoration_as_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/textDecoration_mxml_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/textDecoration_mxml_test2@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/vhc_as_test1@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/baselines/vhc_as_test2@android_240ppi.png

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/ButtonBar_ContainerIntegration.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/ButtonBar_ContainerIntegration.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/ButtonBar_ContainerIntegration.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/ButtonBar_ContainerIntegration.mxml Mon Nov 19 21:42:28 2012
@@ -65,7 +65,7 @@ States
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -82,7 +82,7 @@ States
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>	
     </body>
@@ -99,7 +99,7 @@ States
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -114,7 +114,7 @@ States
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
         <RunCode code="FlexGlobals.topLevelApplication.hidePopUp()" />

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_box_test1@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_box_test1%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_box_test2@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_box_test2%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_panel_test5@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_panel_test5%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_popup_test6@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/integration/baselines/containerIntegration_popup_test6%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_buttonBar_keyDownHandler.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_buttonBar_keyDownHandler.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_buttonBar_keyDownHandler.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_buttonBar_keyDownHandler.mxml Mon Nov 19 21:42:28 2012
@@ -73,7 +73,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<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 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -113,7 +113,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<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 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<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 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -172,7 +172,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -192,7 +192,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -212,7 +212,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -233,7 +233,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -254,7 +254,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -276,7 +276,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -298,7 +298,7 @@ buttonBar_keyDownHandler(event:KeyboardE
 		<ConditionalValue deviceDensity="240" os="android"  />
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<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/ButtonBar/methods/ButtonBar_defaultButtonBarItemRendererFunction.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_defaultButtonBarItemRendererFunction.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_defaultButtonBarItemRendererFunction.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/ButtonBar_defaultButtonBarItemRendererFunction.mxml Mon Nov 19 21:42:28 2012
@@ -77,7 +77,7 @@ For these tests, custom skins are used.
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -95,7 +95,7 @@ For these tests, custom skins are used.
 		<ConditionalValue deviceDensity="240" os="android"  />        
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
         </CompareBitmap>
     </body>
@@ -124,7 +124,7 @@ For these tests, custom skins are used.
 		<ConditionalValue deviceDensity="240" os="android"  />        
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<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/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test10@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test10%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test11@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test11%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test12@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test12%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test1@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test1%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test2@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test2%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test3@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test3%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test4@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test4%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test5@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test5%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test6@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test6%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test7@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test7%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test8@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test8%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test9@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/buttonBar_keyDownHandler_test9%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/customSkinSanityCheck@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/customSkinSanityCheck%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/methods/baselines/defaultButtonBarItemRendererFunction_test1%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_enabled.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_enabled.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_enabled.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_enabled.mxml Mon Nov 19 21:42:28 2012
@@ -87,7 +87,7 @@ enabled
 		<ConditionalValue deviceDensity="160" os="win"  />
 		<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/ButtonBar/properties/ButtonBar_icon_properties.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_icon_properties.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_icon_properties.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_icon_properties.mxml Mon Nov 19 21:42:28 2012
@@ -62,7 +62,7 @@
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -81,7 +81,7 @@
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
 				
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -99,7 +99,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -117,7 +117,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />	
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -136,7 +136,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -156,7 +156,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -176,7 +176,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -195,7 +195,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />	
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -214,7 +214,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />	
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -233,7 +233,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />	
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -252,7 +252,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />	
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -271,7 +271,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -290,7 +290,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -309,7 +309,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -327,7 +327,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -345,7 +345,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -363,7 +363,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -381,7 +381,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -399,7 +399,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -417,7 +417,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -435,7 +435,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -453,7 +453,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -472,7 +472,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -481,17 +481,21 @@
 		<TestCase testID="ButtonBar_icon_test24" keywords="[ButtonBar,icon]" description="Try different types of files for the icon(jpg, jpg, nonworking swf).">
 			<setup>
 			    <ResetComponent target="comp1" className="comps.BBIconComp1" waitEvent="updateComplete" />
+				<SetProperty target="comp1.bb1" propertyName="iconField" value="theIcon" />
+				<SetProperty target="comp1.bb1" propertyName="labelField" value="theData" />
+				<SetProperty target="comp1.bb1" propertyName="dataProvider" valueExpression="value = FlexGlobals.topLevelApplication.comp1.ac11" waitEvent="updateComplete" />
+				
 			</setup>
 			<body>
-				<SetProperty target="comp1.bb1" propertyName="iconField" value="theIcon" />
+				<!--<SetProperty target="comp1.bb1" propertyName="iconField" value="theIcon" />
 				<SetProperty target="comp1.bb1" propertyName="labelField" value="theData" />
 				<SetProperty target="comp1.bb1" propertyName="dataProvider" valueExpression="value = FlexGlobals.topLevelApplication.comp1.ac11" waitEvent="updateComplete" />
-				<Pause timeout="1000"/>
+				--><Pause timeout="1000"/>
 				<CompareBitmap target="comp1.bb1" url="../properties/baselines" numColorVariances="80" ignoreMaxColorVariance="true" >
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -510,7 +514,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -529,7 +533,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />	
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -548,7 +552,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />		
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -567,7 +571,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />		
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -587,7 +591,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />		
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -605,7 +609,7 @@
 							<ConditionalValue deviceDensity="240" os="android"  />		
 							<ConditionalValue deviceDensity="160" os="win"  />
 							<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/ButtonBar/properties/ButtonBar_properties.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_properties.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_properties.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_properties.mxml Mon Nov 19 21:42:28 2012
@@ -141,7 +141,7 @@ enabled
         	<ConditionalValue deviceDensity="160" value="27"/>
         	<ConditionalValue deviceDensity="160" os="qnx" value="26"/>
         	<ConditionalValue deviceDensity="320" value="54"/>
-        	<ConditionalValue deviceDensity="320" os="iphone" value="55"/>
+        	<ConditionalValue deviceDensity="320" os="ios" value="55"/>
         </AssertPropertyValue>
     </body>
 </TestCase>
@@ -157,7 +157,7 @@ enabled
 		        	<ConditionalValue deviceDensity="160" value="27"/>
 		        	<ConditionalValue deviceDensity="160" os="qnx" value="26"/>
                 	<ConditionalValue deviceDensity="320" value="54"/>
-					<ConditionalValue deviceDensity="320" os="iphone" value="55"/>
+					<ConditionalValue deviceDensity="320" os="ios" value="55"/>
         </AssertPropertyValue>
     </body>
 </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_selectedItem.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_selectedItem.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_selectedItem.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/ButtonBar_selectedItem.mxml Mon Nov 19 21:42:28 2012
@@ -72,7 +72,7 @@ state and that selectedIndex is correct.
 			<ConditionalValue deviceDensity="240" os="android"  />
 			<ConditionalValue deviceDensity="160" os="win"  />
 			<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/ButtonBar/properties/baselines/ButtonBar_icon_fxg@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_fxg%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test10@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test10%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test11@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test11%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test12@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test12%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test13@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test13%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test14@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test14%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test15@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test15%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test16@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test16%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test17@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test17%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test18@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test18%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test19@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test19%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test1@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test1%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test20@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test20%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test21@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test21%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test22@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test22%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test23@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test23%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test24@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test24%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test25@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test25%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test26@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test26%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test27@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test27%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test28@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test28%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test29@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test29%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test2@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test2%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test3@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test3%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test4@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test4%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test5@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test5%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test6@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test6%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test7@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test7%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test8@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test8%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test9@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/ButtonBar_icon_test9%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/enabled_test2@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/enabled_test2%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/selectedItem_sanityTest@android_240ppi.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/properties/baselines/selectedItem_sanityTest%40android_240ppi.png?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/ButtonBar_GlobalStyles_tester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/ButtonBar_GlobalStyles_tester.mxml?rev=1411438&r1=1411437&r2=1411438&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/ButtonBar_GlobalStyles_tester.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/ButtonBar/styles/ButtonBar_GlobalStyles_tester.mxml Mon Nov 19 21:42:28 2012
@@ -59,7 +59,7 @@
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -72,7 +72,7 @@
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -90,7 +90,7 @@
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
 
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -107,7 +107,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<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="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 			    </CompareBitmap>
 			</body>
@@ -144,7 +144,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 			    </CompareBitmap>
 			</body>
@@ -161,7 +161,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<ConditionalValue deviceDensity="320" os="win"  />
-							<ConditionalValue deviceDensity="320" os="iphone" />
+							<ConditionalValue deviceDensity="320" os="ios" />
 							<ConditionalValue deviceDensity="160" os="qnx" />
 				</CompareBitmap>
 			</body>
@@ -178,7 +178,7 @@
 					<ConditionalValue deviceDensity="240" os="android"  />
 					<ConditionalValue deviceDensity="160" os="win"  />
 					<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