Author: pent
Date: Wed Nov 21 20:34:58 2012
New Revision: 1412275
URL: http://svn.apache.org/viewvc?rev=1412275&view=rev
Log:
Adjustments due to font changes.
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml?rev=1412275&r1=1412274&r2=1412275&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester1.mxml
Wed Nov 21 20:34:58 2012
@@ -68,7 +68,7 @@
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="width" value="0" />
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="height" >
<ConditionalValue deviceDensity="160"
os="win" value="15" />
- <ConditionalValue deviceDensity="240"
value="25" />
+ <ConditionalValue deviceDensity="240"
value="22" />
<ConditionalValue deviceDensity="320"
value="30" />
<ConditionalValue deviceDensity="160"
os="qnx" value="16" />
</AssertPropertyValue>
@@ -101,7 +101,7 @@
<ConditionalValue deviceDensity="160"
os="win"/>
<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,14 +119,14 @@
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="text" value="The quick brown
fox jumps over the lazy dog." />
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="width" >
<ConditionalValue deviceDensity="160"
os="win" value="277"/>
- <ConditionalValue deviceDensity="240"
value="488"/>
+ <ConditionalValue deviceDensity="240"
value="445"/>
<ConditionalValue deviceDensity="320"
value="579"/>
- <ConditionalValue deviceDensity="320"
os="iphone" value="593"/>
+ <ConditionalValue deviceDensity="320"
os="ios" value="593"/>
<ConditionalValue deviceDensity="160"
os="qnx" value="302"/>
</AssertPropertyValue>
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="height" >
<ConditionalValue deviceDensity="160"
os="win" value="15" />
- <ConditionalValue deviceDensity="240"
value="25" />
+ <ConditionalValue deviceDensity="240"
value="22" />
<ConditionalValue deviceDensity="320"
value="30" />
<ConditionalValue deviceDensity="160"
os="qnx" value="16"/>
</AssertPropertyValue>
@@ -134,7 +134,7 @@
<ConditionalValue deviceDensity="160"
os="win"/>
<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>
@@ -150,14 +150,14 @@
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="text"
valueExpression="value='The quick brown\nfox jumps over\nthe lazy dog.';" />
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="width" >
<ConditionalValue deviceDensity="160"
os="win" value="103" />
- <ConditionalValue deviceDensity="240"
value="179" />
+ <ConditionalValue deviceDensity="240"
value="164" />
<ConditionalValue deviceDensity="320"
value="215" />
- <ConditionalValue deviceDensity="320"
os="iphone" value="219"/>
+ <ConditionalValue deviceDensity="320"
os="ios" value="219"/>
<ConditionalValue deviceDensity="160"
os="qnx" value="112"/>
</AssertPropertyValue>
<AssertPropertyValue
target="navigator.activeView.lbl1" propertyName="height" value="82" >
<ConditionalValue deviceDensity="160"
os="win" value="53" />
- <ConditionalValue deviceDensity="240"
value="82" />
+ <ConditionalValue deviceDensity="240"
value="80" />
<ConditionalValue deviceDensity="320"
value="106" />
<ConditionalValue deviceDensity="160"
os="qnx" value="55"/>
</AssertPropertyValue>
@@ -165,7 +165,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>
@@ -188,7 +188,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>
@@ -210,7 +210,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>
@@ -231,7 +231,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>
@@ -253,7 +253,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>
@@ -274,7 +274,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>
@@ -296,7 +296,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>
@@ -318,7 +318,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>
@@ -340,7 +340,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>
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml?rev=1412275&r1=1412274&r2=1412275&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/Label/properties/Label_Properties_tester2.mxml
Wed Nov 21 20:34:58 2012
@@ -60,7 +60,7 @@
<body>
<AssertPropertyValue propertyName="height"
target="navigator.activeView.lbl1">
<ConditionalValue deviceDensity="160"
os="win" value="15" />
- <ConditionalValue deviceDensity="240"
value="25" />
+ <ConditionalValue deviceDensity="240"
value="22" />
<ConditionalValue deviceDensity="320"
value="30" />
<ConditionalValue deviceDensity="160"
os="qnx" value="16" />
</AssertPropertyValue>
@@ -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>
@@ -99,7 +99,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>
@@ -128,7 +128,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>
@@ -147,7 +147,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>
@@ -166,7 +166,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>
@@ -197,7 +197,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>
@@ -216,7 +216,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>
@@ -235,7 +235,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>
@@ -267,7 +267,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>
@@ -299,7 +299,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>
@@ -412,7 +412,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>
@@ -432,7 +432,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>
@@ -463,7 +463,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>
@@ -483,7 +483,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>
@@ -506,7 +506,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>
@@ -524,7 +524,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>
@@ -544,7 +544,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>
@@ -563,7 +563,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>
@@ -584,7 +584,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>
@@ -604,7 +604,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>
@@ -626,7 +626,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>
@@ -646,7 +646,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>
@@ -667,7 +667,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>
@@ -689,7 +689,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>
@@ -711,7 +711,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>
@@ -733,7 +733,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>
@@ -754,7 +754,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>
@@ -774,7 +774,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>
@@ -794,7 +794,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>
@@ -833,7 +833,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>
@@ -853,7 +853,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>
@@ -873,7 +873,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>
