Author: pent
Date: Wed Nov 21 20:35:41 2012
New Revision: 1412276
URL: http://svn.apache.org/viewvc?rev=1412276&view=rev
Log:
Adjustments due to font changes. Changed os="iphone" to os="ios"
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_GlobalStyles.mxml
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_Styles_tester.mxml
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_GlobalStyles.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_GlobalStyles.mxml?rev=1412276&r1=1412275&r2=1412276&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_GlobalStyles.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_GlobalStyles.mxml
Wed Nov 21 20:35:41 2012
@@ -62,7 +62,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<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" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320"
os="win"/>
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -100,7 +100,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320"
os="win"/>
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -119,7 +119,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320"
/>
- <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/Label/Styles/Label_Styles_tester.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_Styles_tester.mxml?rev=1412276&r1=1412275&r2=1412276&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_Styles_tester.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/Styles/Label_Styles_tester.mxml
Wed Nov 21 20:35:41 2012
@@ -86,7 +86,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320"/>
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -105,7 +105,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -124,7 +124,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -143,7 +143,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -162,7 +162,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -181,7 +181,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -200,7 +200,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -219,7 +219,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -238,7 +238,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -271,7 +271,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -290,7 +290,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -311,7 +311,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -332,7 +332,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -353,7 +353,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -375,7 +375,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -396,7 +396,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -417,7 +417,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -437,7 +437,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -456,7 +456,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -552,7 +552,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -573,7 +573,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320"/>
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -593,7 +593,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320"
os="win"/>
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -613,7 +613,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320"
os="win"/>
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -648,12 +648,12 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
</TestCase>
-
+<!--
<TestCase testID="Compare_Label_RichText_kerning_off"
description="Check 'off' value of kerning style" keywords="[Spark Label,
RichText, kerning, Graphic]">
<setup>
<RunCode
code="FlexGlobals.topLevelApplication.doPopAll()" waitTarget="navigator"
waitEvent="viewChangeComplete" />
@@ -669,12 +669,12 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
</TestCase>
-
+-->
<!-- style: ligatureLevel -->
<TestCase testID="Compare_Label_RichText_ligatureLevel_default"
description="Check default value of ligatureLevel style" keywords="[Spark
Label, RichText, ligatureLevel, Graphic]">
@@ -715,7 +715,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -734,7 +734,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -767,7 +767,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -789,7 +789,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -813,7 +813,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -834,7 +834,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -859,7 +859,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -883,7 +883,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -904,7 +904,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -924,7 +924,7 @@
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="320"
os="iphone"/>
+ <ConditionalValue deviceDensity="320"
os="ios"/>
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
