Merge branch 'NewDPIBuckets' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1b877a7b Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1b877a7b Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1b877a7b Branch: refs/heads/develop Commit: 1b877a7b7d821e9ba68bdc0d42bf89f9840c9b34 Parents: 65c219c 73dd37a Author: Justin Mclean <[email protected]> Authored: Mon Sep 2 09:36:20 2013 +1000 Committer: Justin Mclean <[email protected]> Committed: Mon Sep 2 09:36:20 2013 +1000 ---------------------------------------------------------------------- flex-sdk-description.xml | 2 +- .../framework/src/mx/core/DPIClassification.as | 22 ++- .../framework/src/mx/core/RuntimeDPIProvider.as | 20 +- .../framework/src/mx/utils/DensityUtil.as | 4 +- .../src/spark/components/Callout.as | 20 +- .../src/spark/components/IconItemRenderer.as | 20 +- .../src/spark/components/LabelItemRenderer.as | 20 +- .../spark/components/SpinnerListItemRenderer.as | 20 +- .../spark/preloaders/SplashScreenImageSource.as | 2 +- frameworks/projects/mobiletheme/defaults.css | 197 +++++++++++++++++++ .../skins/mobile/BeveledActionButtonSkin.as | 72 +++++-- .../spark/skins/mobile/BeveledBackButtonSkin.as | 72 +++++-- .../skins/mobile/ButtonBarFirstButtonSkin.as | 46 ++++- .../skins/mobile/ButtonBarLastButtonSkin.as | 46 ++++- .../skins/mobile/ButtonBarMiddleButtonSkin.as | 42 ++-- .../src/spark/skins/mobile/ButtonSkin.as | 72 +++++-- .../spark/skins/mobile/CalloutActionBarSkin.as | 20 +- .../src/spark/skins/mobile/CalloutSkin.as | 35 ++++ .../skins/mobile/CalloutViewNavigatorSkin.as | 30 ++- .../src/spark/skins/mobile/CheckBoxSkin.as | 54 ++++- .../src/spark/skins/mobile/HScrollBarSkin.as | 28 ++- .../spark/skins/mobile/HScrollBarThumbSkin.as | 8 +- .../src/spark/skins/mobile/HSliderThumbSkin.as | 73 +++++-- .../src/spark/skins/mobile/HSliderTrackSkin.as | 47 +++-- .../src/spark/skins/mobile/ImageSkin.as | 22 ++- .../src/spark/skins/mobile/RadioButtonSkin.as | 80 ++++++-- .../skins/mobile/SpinnerListContainerSkin.as | 51 +++-- .../src/spark/skins/mobile/SpinnerListSkin.as | 1 + .../src/spark/skins/mobile/StageTextAreaSkin.as | 20 +- .../TabbedViewNavigatorTabBarFirstTabSkin.as | 9 + .../TabbedViewNavigatorTabBarLastTabSkin.as | 2 + .../skins/mobile/TextAreaHScrollBarSkin.as | 28 ++- .../skins/mobile/TextAreaHScrollBarThumbSkin.as | 33 +++- .../src/spark/skins/mobile/TextAreaSkin.as | 42 +++- .../skins/mobile/TextAreaVScrollBarSkin.as | 28 ++- .../skins/mobile/TextAreaVScrollBarThumbSkin.as | 34 +++- .../src/spark/skins/mobile/TextInputSkin.as | 42 +++- .../src/spark/skins/mobile/ToggleSwitchSkin.as | 54 +++-- .../skins/mobile/TransparentActionButtonSkin.as | 9 + .../mobile/TransparentNavigationButtonSkin.as | 9 + .../src/spark/skins/mobile/VScrollBarSkin.as | 28 ++- .../spark/skins/mobile/VScrollBarThumbSkin.as | 8 +- .../src/spark/skins/mobile/ViewMenuItemSkin.as | 70 +++++-- .../src/spark/skins/mobile/ViewMenuSkin.mxml | 14 +- .../supportClasses/ActionBarButtonSkinBase.as | 27 ++- .../skins/mobile/supportClasses/CalloutArrow.as | 34 +++- .../mobile/supportClasses/HSliderDataTip.as | 54 +++-- .../mobile/supportClasses/StageTextSkinBase.as | 44 +++-- .../TabbedViewNavigatorTabBarTabSkinBase.as | 48 +++-- .../mobile120/assets/ActionBarBackground.fxg | 87 ++++++++ .../assets/BeveledActionButton_down.fxg | 61 ++++++ .../assets/BeveledActionButton_fill.fxg | 38 ++++ .../mobile120/assets/BeveledActionButton_up.fxg | 63 ++++++ .../mobile120/assets/BeveledBackButton_down.fxg | 62 ++++++ .../mobile120/assets/BeveledBackButton_fill.fxg | 39 ++++ .../mobile120/assets/BeveledBackButton_up.fxg | 64 ++++++ .../assets/ButtonBarFirstButton_down.fxg | 57 ++++++ .../assets/ButtonBarFirstButton_selected.fxg | 57 ++++++ .../assets/ButtonBarFirstButton_up.fxg | 48 +++++ .../assets/ButtonBarLastButton_down.fxg | 57 ++++++ .../assets/ButtonBarLastButton_selected.fxg | 57 ++++++ .../mobile120/assets/ButtonBarLastButton_up.fxg | 48 +++++ .../assets/ButtonBarMiddleButton_down.fxg | 54 +++++ .../assets/ButtonBarMiddleButton_selected.fxg | 54 +++++ .../assets/ButtonBarMiddleButton_up.fxg | 54 +++++ .../skins/mobile120/assets/Button_down.fxg | 50 +++++ .../spark/skins/mobile120/assets/Button_up.fxg | 29 +++ .../assets/CalloutContentBackground.fxg | 51 +++++ .../skins/mobile120/assets/CheckBox_down.fxg | 57 ++++++ .../mobile120/assets/CheckBox_downSymbol.fxg | 45 +++++ .../assets/CheckBox_downSymbolSelected.fxg | 45 +++++ .../skins/mobile120/assets/CheckBox_up.fxg | 59 ++++++ .../mobile120/assets/CheckBox_upSymbol.fxg | 45 +++++ .../assets/CheckBox_upSymbolSelected.fxg | 44 +++++ .../mobile120/assets/HSliderThumb_normal.fxg | 44 +++++ .../mobile120/assets/HSliderThumb_pressed.fxg | 56 ++++++ .../skins/mobile120/assets/HSliderTrack.fxg | 53 +++++ .../skins/mobile120/assets/ImageInvalid.fxg | 46 +++++ .../skins/mobile120/assets/RadioButton_down.fxg | 54 +++++ .../mobile120/assets/RadioButton_downSymbol.fxg | 34 ++++ .../assets/RadioButton_downSymbolSelected.fxg | 34 ++++ .../skins/mobile120/assets/RadioButton_up.fxg | 45 +++++ .../mobile120/assets/RadioButton_upSymbol.fxg | 34 ++++ .../assets/RadioButton_upSymbolSelected.fxg | 34 ++++ .../assets/SpinnerListContainerBackground.fxg | 33 ++++ .../SpinnerListContainerSelectionIndicator.fxg | 67 +++++++ .../assets/SpinnerListContainerShadow.fxg | 32 +++ ...edViewNavigatorButtonBarFirstButton_down.fxg | 55 ++++++ ...ewNavigatorButtonBarFirstButton_selected.fxg | 55 ++++++ ...bbedViewNavigatorButtonBarFirstButton_up.fxg | 55 ++++++ ...bedViewNavigatorButtonBarLastButton_down.fxg | 61 ++++++ ...iewNavigatorButtonBarLastButton_selected.fxg | 61 ++++++ ...abbedViewNavigatorButtonBarLastButton_up.fxg | 61 ++++++ .../skins/mobile120/assets/TextInput_border.fxg | 39 ++++ .../assets/ToggleSwitch_contentShadow.fxg | 30 +++ .../assets/TransparentActionButton_down.fxg | 62 ++++++ .../assets/TransparentActionButton_up.fxg | 52 +++++ .../assets/TransparentNavigationButton_down.fxg | 62 ++++++ .../assets/TransparentNavigationButton_up.fxg | 52 +++++ .../mobile120/assets/ViewMenuItem_down.fxg | 49 +++++ .../assets/ViewMenuItem_showsCaret.fxg | 34 ++++ .../skins/mobile120/assets/ViewMenuItem_up.fxg | 34 ++++ .../spark/skins/mobile160/assets/Button_up.fxg | 3 +- .../spark/skins/mobile240/assets/Button_up.fxg | 3 +- .../spark/skins/mobile320/assets/Button_up.fxg | 3 +- .../mobile480/assets/ActionBarBackground.fxg | 158 +++++++-------- .../assets/BeveledActionButton_down.fxg | 71 ++++--- .../assets/BeveledActionButton_fill.fxg | 30 +-- .../mobile480/assets/BeveledActionButton_up.fxg | 75 +++---- .../mobile480/assets/BeveledBackButton_down.fxg | 73 ++++--- .../mobile480/assets/BeveledBackButton_fill.fxg | 31 +-- .../mobile480/assets/BeveledBackButton_up.fxg | 77 ++++---- .../assets/ButtonBarFirstButton_down.fxg | 64 +++--- .../assets/ButtonBarFirstButton_selected.fxg | 64 +++--- .../assets/ButtonBarFirstButton_up.fxg | 49 ++--- .../assets/ButtonBarLastButton_down.fxg | 64 +++--- .../assets/ButtonBarLastButton_selected.fxg | 64 +++--- .../mobile480/assets/ButtonBarLastButton_up.fxg | 49 ++--- .../assets/ButtonBarMiddleButton_down.fxg | 61 +++--- .../assets/ButtonBarMiddleButton_selected.fxg | 61 +++--- .../assets/ButtonBarMiddleButton_up.fxg | 61 +++--- .../skins/mobile480/assets/Button_down.fxg | 60 +++--- .../spark/skins/mobile480/assets/Button_up.fxg | 17 +- .../assets/CalloutContentBackground.fxg | 54 ++--- .../skins/mobile480/assets/CheckBox_down.fxg | 91 ++++----- .../mobile480/assets/CheckBox_downSymbol.fxg | 39 ++-- .../assets/CheckBox_downSymbolSelected.fxg | 41 ++-- .../skins/mobile480/assets/CheckBox_up.fxg | 15 +- .../mobile480/assets/CheckBox_upSymbol.fxg | 39 ++-- .../assets/CheckBox_upSymbolSelected.fxg | 39 ++-- .../mobile480/assets/HSliderThumb_normal.fxg | 45 ++--- .../mobile480/assets/HSliderThumb_pressed.fxg | 71 +++---- .../skins/mobile480/assets/HSliderTrack.fxg | 48 ++--- .../skins/mobile480/assets/ImageInvalid.fxg | 46 +++-- .../skins/mobile480/assets/RadioButton_down.fxg | 56 +++--- .../mobile480/assets/RadioButton_downSymbol.fxg | 29 ++- .../assets/RadioButton_downSymbolSelected.fxg | 29 ++- .../skins/mobile480/assets/RadioButton_up.fxg | 46 ++--- .../mobile480/assets/RadioButton_upSymbol.fxg | 29 ++- .../assets/RadioButton_upSymbolSelected.fxg | 29 ++- .../assets/SpinnerListContainerBackground.fxg | 23 +-- .../SpinnerListContainerSelectionIndicator.fxg | 98 ++++----- .../assets/SpinnerListContainerShadow.fxg | 24 +-- ...edViewNavigatorButtonBarFirstButton_down.fxg | 76 +++---- ...ewNavigatorButtonBarFirstButton_selected.fxg | 75 +++---- ...bbedViewNavigatorButtonBarFirstButton_up.fxg | 75 +++---- ...bedViewNavigatorButtonBarLastButton_down.fxg | 87 ++++---- ...iewNavigatorButtonBarLastButton_selected.fxg | 87 ++++---- ...abbedViewNavigatorButtonBarLastButton_up.fxg | 87 ++++---- .../skins/mobile480/assets/TextInput_border.fxg | 33 ++-- .../assets/ToggleSwitch_contentShadow.fxg | 21 +- .../assets/TransparentActionButton_down.fxg | 89 +++++---- .../assets/TransparentActionButton_up.fxg | 69 ++++--- .../assets/TransparentNavigationButton_down.fxg | 89 +++++---- .../assets/TransparentNavigationButton_up.fxg | 69 ++++--- .../mobile480/assets/ViewMenuItem_down.fxg | 61 +++--- .../assets/ViewMenuItem_showsCaret.fxg | 30 +-- .../skins/mobile480/assets/ViewMenuItem_up.fxg | 29 +-- .../mobile640/assets/ActionBarBackground.fxg | 102 ++++++++++ .../assets/BeveledActionButton_down.fxg | 61 ++++++ .../assets/BeveledActionButton_fill.fxg | 38 ++++ .../mobile640/assets/BeveledActionButton_up.fxg | 63 ++++++ .../mobile640/assets/BeveledBackButton_down.fxg | 63 ++++++ .../mobile640/assets/BeveledBackButton_fill.fxg | 39 ++++ .../mobile640/assets/BeveledBackButton_up.fxg | 65 ++++++ .../assets/ButtonBarFirstButton_down.fxg | 57 ++++++ .../assets/ButtonBarFirstButton_selected.fxg | 57 ++++++ .../assets/ButtonBarFirstButton_up.fxg | 48 +++++ .../assets/ButtonBarLastButton_down.fxg | 57 ++++++ .../assets/ButtonBarLastButton_selected.fxg | 57 ++++++ .../mobile640/assets/ButtonBarLastButton_up.fxg | 48 +++++ .../assets/ButtonBarMiddleButton_down.fxg | 54 +++++ .../assets/ButtonBarMiddleButton_selected.fxg | 54 +++++ .../assets/ButtonBarMiddleButton_up.fxg | 54 +++++ .../skins/mobile640/assets/Button_down.fxg | 51 +++++ .../spark/skins/mobile640/assets/Button_up.fxg | 29 +++ .../assets/CalloutContentBackground.fxg | 51 +++++ .../skins/mobile640/assets/CheckBox_down.fxg | 67 +++++++ .../mobile640/assets/CheckBox_downSymbol.fxg | 41 ++++ .../assets/CheckBox_downSymbolSelected.fxg | 41 ++++ .../skins/mobile640/assets/CheckBox_up.fxg | 59 ++++++ .../mobile640/assets/CheckBox_upSymbol.fxg | 41 ++++ .../assets/CheckBox_upSymbolSelected.fxg | 41 ++++ .../mobile640/assets/HSliderThumb_normal.fxg | 44 +++++ .../mobile640/assets/HSliderThumb_pressed.fxg | 56 ++++++ .../skins/mobile640/assets/HSliderTrack.fxg | 45 +++++ .../skins/mobile640/assets/ImageInvalid.fxg | 46 +++++ .../skins/mobile640/assets/RadioButton_down.fxg | 48 +++++ .../mobile640/assets/RadioButton_downSymbol.fxg | 34 ++++ .../assets/RadioButton_downSymbolSelected.fxg | 34 ++++ .../skins/mobile640/assets/RadioButton_up.fxg | 43 ++++ .../mobile640/assets/RadioButton_upSymbol.fxg | 34 ++++ .../assets/RadioButton_upSymbolSelected.fxg | 34 ++++ .../assets/SpinnerListContainerBackground.fxg | 33 ++++ .../SpinnerListContainerSelectionIndicator.fxg | 67 +++++++ .../assets/SpinnerListContainerShadow.fxg | 32 +++ ...edViewNavigatorButtonBarFirstButton_down.fxg | 63 ++++++ ...ewNavigatorButtonBarFirstButton_selected.fxg | 62 ++++++ ...bbedViewNavigatorButtonBarFirstButton_up.fxg | 62 ++++++ ...bedViewNavigatorButtonBarLastButton_down.fxg | 68 +++++++ ...iewNavigatorButtonBarLastButton_selected.fxg | 68 +++++++ ...abbedViewNavigatorButtonBarLastButton_up.fxg | 68 +++++++ .../skins/mobile640/assets/TextInput_border.fxg | 39 ++++ .../assets/ToggleSwitch_contentShadow.fxg | 30 +++ .../assets/TransparentActionButton_down.fxg | 69 +++++++ .../assets/TransparentActionButton_up.fxg | 59 ++++++ .../assets/TransparentNavigationButton_down.fxg | 69 +++++++ .../assets/TransparentNavigationButton_up.fxg | 59 ++++++ .../mobile640/assets/ViewMenuItem_down.fxg | 54 +++++ .../assets/ViewMenuItem_showsCaret.fxg | 36 ++++ .../skins/mobile640/assets/ViewMenuItem_up.fxg | 37 ++++ .../spark/src/spark/components/Application.as | 12 +- .../spark/src/spark/components/BusyIndicator.as | 22 ++- .../src/spark/utils/MultiDPIBitmapSource.as | 98 +++++++-- mustella/as3/src/mustella/ConditionalValue.as | 2 +- .../integration/ImageScaling_tester.mxml | 46 +++-- [email protected] | 192 ++++++++++++++++++ [email protected] | 192 ++++++++++++++++++ .../[email protected] | 192 ++++++++++++++++++ [email protected] | 192 ++++++++++++++++++ [email protected] | 192 ++++++++++++++++++ .../[email protected] | 192 ++++++++++++++++++ [email protected] | 192 ++++++++++++++++++ [email protected] | 192 ++++++++++++++++++ [email protected] | 192 ++++++++++++++++++ .../swfs/ViewNavigatorApplication120dpi.mxml | 29 +++ .../swfs/ViewNavigatorApplication640dpi.mxml | 29 +++ .../ViewNavigatorApplication120dpiHomeView.mxml | 27 +++ .../ViewNavigatorApplication640dpiHomeView.mxml | 27 +++ .../tests/applicationDPI_120.mxml | 123 ++++++++++++ .../tests/applicationDPI_160.mxml | 8 +- .../tests/applicationDPI_240.mxml | 8 +- .../tests/applicationDPI_320.mxml | 8 +- .../tests/applicationDPI_480.mxml | 8 +- .../tests/applicationDPI_640.mxml | 123 ++++++++++++ .../tests/applicationDPI_none.mxml | 4 + .../Check_bitmap_120@android_240ppi.png | Bin 0 -> 877 bytes .../Check_bitmap_120@android_240ppi.png.xml | 54 +++++ .../Check_bitmap_160@android_240ppi.png.xml | 54 +++++ .../Check_bitmap_240@android_240ppi.png.xml | 54 +++++ .../Check_bitmap_320@android_240ppi.png.xml | 57 ++++++ .../Check_bitmap_480@android_240ppi.png.xml | 54 +++++ .../Check_bitmap_640@android_240ppi.png | Bin 0 -> 209 bytes .../Check_bitmap_640@android_240ppi.png.xml | 54 +++++ 244 files changed, 10988 insertions(+), 1794 deletions(-) ----------------------------------------------------------------------
