You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2012/12/14 22:05:54 UTC

svn commit: r1422078 - in /incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries: integration/ integration/baselines/ swfs/ swfs/stylesheets/ swfs/views/

Author: pent
Date: Fri Dec 14 21:05:35 2012
New Revision: 1422078

URL: http://svn.apache.org/viewvc?rev=1422078&view=rev
Log:
Regenerated baselines to account for new fonts. Modified test code to account for tests running in the emulator.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/CSSMediaQueries_Integration_ClassSelectors.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ApplicationDPISpecified_ClassSelector@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ApplicationDPISpecified_TypeSelector@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_160dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_160dpi_NoDefaultStyle@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_160dpi_OR_320dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_320dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_Android160dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_Android240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_Android320dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_Android@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_ClassReference_DPIBasedQueries@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_DefaultSpecifiedAfterQuery_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_IPHONE160dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_IPHONE160dpi_OR_IPHONE320dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_IPHONE320dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_IPHONE@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_InvalidDPI@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_InvalidFeature@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_InvalidOS@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_LowercaseIPHONE@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MediaAll_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MediaAll_NoFeatures@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MediaOnlyScreen_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MediaScreen_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MediaScreen_NoFeatures@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MediaUnknown_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MissingDPI@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MissingOS@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MultipleQueries@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_MultipleQueriesEvaluateTrue@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_InvalidFeature@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaAll_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaAll_NoFeatures@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaScreen_160dpi_OR_320dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaScreen_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaScreen_Android240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaScreen_IPHONE160dpi_OR_IPHONE320dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaScreen_NoFeatures@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NOT_MediaUnknown_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_NoQuotesAndroid@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_QNX160dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_QNX@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_QuotesAroundDPI@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_UppercaseAND_Android240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_UppercaseAndroid@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_UppercaseFeatureName_Android@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_UppercaseMediaScreen_Android@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_UppercaseMediaTag_Android@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_UppercaseNOT_MediaAll_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ClassSelector_UppercaseONLY_MediaOnlyScreen_240dpi@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ExternalStylesheet_ClassSelector@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/ExternalStylesheet_TypeSelector@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/TypeSelector_ButtonStyles@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/baselines/TypeSelector_Descendent@android_240ppi.png
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/TypeSelectorApp.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/stylesheets/MediaQueryExternalStylesheet.css
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueriesEvaluateTrue_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueries_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android240dpi_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NOT_MediaScreen_Android240dpi_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NoQuotesAndroid_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAND_Android240dpi_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAndroid_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseFeatureName_Android_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaScreen_Android_View.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaTag_Android_View.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/CSSMediaQueries_Integration_ClassSelectors.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/CSSMediaQueries_Integration_ClassSelectors.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/CSSMediaQueries_Integration_ClassSelectors.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/integration/CSSMediaQueries_Integration_ClassSelectors.mxml Fri Dec 14 21:05:35 2012
@@ -258,6 +258,7 @@
 					<ConditionalValue os="android" deviceDensity="320" value="28"/>
 					<ConditionalValue os="iphone" deviceDensity="320" value="28"/>
 				</AssertStyleValue>
+				<Pause timeout="400" />
 				<CompareBitmap target="navigator.activeView.testButton" url="../integration/baselines/">
 					<ConditionalValue deviceDensity="160" />
 					<ConditionalValue deviceDensity="320" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/TypeSelectorApp.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/TypeSelectorApp.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/TypeSelectorApp.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/TypeSelectorApp.mxml Fri Dec 14 21:05:35 2012
@@ -56,6 +56,41 @@
 			}
 		}
 		
+		@media screen and (application-dpi: 240)
+		{
+			s|Button
+			{
+				color: #009900;
+				fontSize: 26;			
+			}
+			s|CheckBox:state2
+			{
+				chromeColor: #009900;
+			}
+			s|ActionBar #titleDisplay
+			{
+				color: #00ff00;
+			}
+		}
+		
+		@media screen and (application-dpi: 320)
+		{
+			s|Button
+			{
+				chromeColor: #000099;
+				color: #ffffff;
+				fontSize: 28;			
+			}
+			s|CheckBox:state2
+			{
+				chromeColor: #000099;
+			}
+			s|ActionBar #titleDisplay
+			{
+				color: #0000ff;
+			}
+		}
+		
 		@media screen and (os-platform: "Android") and (application-dpi: 240)
 		{
 			s|Button

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/stylesheets/MediaQueryExternalStylesheet.css
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/stylesheets/MediaQueryExternalStylesheet.css?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/stylesheets/MediaQueryExternalStylesheet.css (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/stylesheets/MediaQueryExternalStylesheet.css Fri Dec 14 21:05:35 2012
@@ -32,6 +32,55 @@ s|Button
 	fontSize: 24;
 }
 
+@media screen and (application-dpi: 160)
+{
+	s|Button
+	{
+		color: #990000;
+		fontSize: 22;			
+	}
+
+	.buttonStyle
+	{
+		chromeColor: #000000;
+		color: #ff0000;
+		fontSize: 22;
+	}
+}
+
+@media screen and (application-dpi: 240)
+{
+	s|Button
+	{
+		color: #009900;
+		fontSize: 26;			
+	}
+
+	.buttonStyle
+	{
+		chromeColor: #000000;
+		color: #00ff00;
+		fontSize: 26;
+	}
+}
+
+@media screen and (application-dpi: 320)
+{
+	s|Button
+	{
+		chromeColor: #000099;
+		color: #ffffff;
+		fontSize: 28;			
+	}
+
+	.buttonStyle
+	{
+		chromeColor: #000000;
+		color: #0000ff;
+		fontSize: 28;
+	}
+}
+
 @media all and (os-platform: "Android") and (application-dpi: 160)
 {
 	s|Button
@@ -63,6 +112,7 @@ s|Button
 		fontSize: 26;
 	}
 }
+
 @media (os-platform: "IOS") and (application-dpi: 320)
 {
 	s|Button

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueriesEvaluateTrue_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueriesEvaluateTrue_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueriesEvaluateTrue_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueriesEvaluateTrue_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,44 +28,31 @@
 			color: #000000;
 			fontSize: 24;
 		}
-		@media (application-dpi: 160)
-		{
-			.buttonMultipleQueriesEvaluateTrueTest
-			{
-				color: #990000;
-				fontSize: 22;
-			}
-		}
+		
+		/* Styles when running on emulator (superseded by specific os-platform values below) */
 		@media screen and (application-dpi: 160)
 		{
 			.buttonMultipleQueriesEvaluateTrueTest
 			{
-				color: #990000;
-				fontSize: 22;
-			}
-		}
-		@media (application-dpi: 160)
-		{
-			.buttonMultipleQueriesEvaluateTrueTest
-			{
-				color: #009900;
+				chromeColor: #990000;
+				color: #000099;
 				fontSize: 26;
 			}
 		}
-		@media (application-dpi: 160) and (os-platform: "Android")
+		@media screen and (application-dpi: 240)
 		{
 			.buttonMultipleQueriesEvaluateTrueTest
 			{
-				chromeColor: #990000;
-				color: #000099;
-				fontSize: 28;
+				chromeColor: #009900;
+				fontSize: 24;
 			}
 		}
-		@media (os-platform: "Android")
+		@media screen and (application-dpi: 320)
 		{
 			.buttonMultipleQueriesEvaluateTrueTest
 			{
 				chromeColor: #009900;
+				fontSize: 28;
 			}
 		}
 	</fx:Style>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueries_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueries_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueries_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/MultipleQueries_View.mxml Fri Dec 14 21:05:35 2012
@@ -22,13 +22,17 @@
 		title="Multiple queries">
 	<fx:Style>
 		@namespace s "library://ns.adobe.com/flex/spark";
+		
+		/* Generic style */
 		.buttonMultipleQueriesTest
 		{
 			chromeColor: #AAAAAA;
 			color: #000000;
 			fontSize: 24;
 		}
-		@media screen and (os-platform: "Android") and (application-dpi: 160)
+		
+		/* Styles when running on emulator (superseded by specific os-platform values below) */
+		@media screen and (application-dpi: 160)
 		{
 			.buttonMultipleQueriesTest
 			{
@@ -37,11 +41,31 @@
 				fontSize: 22;
 			}
 		}
-		@media all and (os-platform: "IOS") and (application-dpi: 160)
+		@media screen and (application-dpi: 240)
+		{
+			.buttonMultipleQueriesTest
+			{
+				chromeColor: #990000;
+				color: #009900;
+				fontSize: 26;
+			}
+		}
+		@media screen and (application-dpi: 320)
 		{
 			.buttonMultipleQueriesTest
 			{
 				chromeColor: #000099;
+				color: #009999;
+				fontSize: 28;
+			}
+		}
+		
+		/* Styles when running on Android devices */
+		@media screen and (os-platform: "Android") and (application-dpi: 160)
+		{
+			.buttonMultipleQueriesTest
+			{
+				chromeColor: #990000;
 				color: #990000;
 				fontSize: 22;
 			}
@@ -55,13 +79,15 @@
 				fontSize: 26;
 			}
 		}
-		@media (os-platform: "Android") and (application-dpi: 320)
+		
+		/* Styles when running on iOS devices */
+		@media all and (os-platform: "IOS") and (application-dpi: 160)
 		{
 			.buttonMultipleQueriesTest
 			{
-				chromeColor: #990000;
-				color: #000099;
-				fontSize: 28;
+				chromeColor: #000099;
+				color: #990000;
+				fontSize: 22;
 			}
 		}
 		@media (os-platform: "IOS") and (application-dpi: 320)

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android240dpi_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android240dpi_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android240dpi_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android240dpi_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,15 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@media screen and (application-dpi: 240)
+		{
+			.buttonAndroid240dpiTest
+			{
+				chromeColor: #990000;
+				color: #009900;
+				fontSize: 26;
+			}
+		}
 		@media (os-platform: "Android") and (application-dpi: 240)
 		{
 			.buttonAndroid240dpiTest

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_Android_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,13 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@media (application-dpi: 240)
+		{
+			.buttonAndroidTest
+			{
+				chromeColor: #990000;
+			}
+		}
 		@media (os-platform: "Android")
 		{
 			.buttonAndroidTest

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NOT_MediaScreen_Android240dpi_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NOT_MediaScreen_Android240dpi_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NOT_MediaScreen_Android240dpi_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NOT_MediaScreen_Android240dpi_View.mxml Fri Dec 14 21:05:35 2012
@@ -24,17 +24,26 @@
 		@namespace s "library://ns.adobe.com/flex/spark";
 		.buttonNotMediaScreenAndroid240dpiTest
 		{
-			chromeColor: #AAAAAA;
-			color: #000000;
-			fontSize: 24;
+			chromeColor: #990000;
+			color: #009900;
+			fontSize: 26;
+		}
+		@media screen and (application-dpi: 240)
+		{
+			.buttonNotMediaScreenAndroid240dpiTest
+			{
+				chromeColor: #AAAAAA;
+				color: #000000;
+				fontSize: 24;
+			}
 		}
 		@media not screen and (os-platform: "Android") and (application-dpi: 240)
 		{
 			.buttonNotMediaScreenAndroid240dpiTest
 			{
-				chromeColor: #990000;
-				color: #009900;
-				fontSize: 26;
+				chromeColor: #AAAAAA;
+				color: #000000;
+				fontSize: 24;
 			}
 		}
 	</fx:Style>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NoQuotesAndroid_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NoQuotesAndroid_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NoQuotesAndroid_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_NoQuotesAndroid_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,13 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@media screen and (application-dpi: 240)
+		{
+			.buttonNoQuotesAndroidTest
+			{
+				chromeColor: #990000;
+			}
+		}
 		@media (os-platform: Android)
 		{
 			.buttonNoQuotesAndroidTest

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAND_Android240dpi_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAND_Android240dpi_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAND_Android240dpi_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAND_Android240dpi_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,15 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@media screen AND (application-dpi: 240)
+		{
+			.buttonUpperCaseANDAndroid240dpiTest
+			{
+				chromeColor: #990000;
+				color: #009900;
+				fontSize: 26;
+			}
+		}
 		@media screen AND (os-platform: "Android") AND (application-dpi: 240)
 		{
 			.buttonUpperCaseANDAndroid240dpiTest

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAndroid_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAndroid_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAndroid_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseAndroid_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,13 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@media screen and (application-dpi: 240)
+		{
+			.buttonUpperCaseAndroidTest
+			{
+				chromeColor: #990000;
+			}
+		}
 		@media (os-platform: "ANDROID")
 		{
 			.buttonUpperCaseAndroidTest

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseFeatureName_Android_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseFeatureName_Android_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseFeatureName_Android_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseFeatureName_Android_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,13 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@media screen and (application-dpi: 240)
+		{
+			.buttonUpperCaseFeatureNameAndroidTest
+			{
+				chromeColor: #990000;
+			}
+		}
 		@media screen and (OS-PLATFORM: "Android")
 		{
 			.buttonUpperCaseFeatureNameAndroidTest

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaScreen_Android_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaScreen_Android_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaScreen_Android_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaScreen_Android_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,13 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@media SCREEN and (application-dpi: 240)
+		{
+			.buttonUpperCaseMediaScreenAndroidTest
+			{
+				chromeColor: #990000;
+			}
+		}
 		@media SCREEN and (os-platform: "Android")
 		{
 			.buttonUpperCaseMediaScreenAndroidTest

Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaTag_Android_View.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaTag_Android_View.mxml?rev=1422078&r1=1422077&r2=1422078&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaTag_Android_View.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/CSSMediaQueries/swfs/views/Query_UppercaseMediaTag_Android_View.mxml Fri Dec 14 21:05:35 2012
@@ -28,6 +28,13 @@
 			color: #000000;
 			fontSize: 24;
 		}
+		@MEDIA (application-dpi: 240)
+		{
+			.buttonUpperCaseMediaTagAndroidTest
+			{
+				chromeColor: #990000;
+			}
+		}
 		@MEDIA (os-platform: "Android")
 		{
 			.buttonUpperCaseMediaTagAndroidTest