You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/03/19 02:41:30 UTC

[49/50] [abbrv] git commit: [flex-sdk] [refs/heads/new_android_skins] - Merge branch 'develop' into new_android_skins

Merge branch 'develop' into new_android_skins

Conflicts:
	frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c1435e3d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c1435e3d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c1435e3d

Branch: refs/heads/new_android_skins
Commit: c1435e3d148cf25e000687d53c95ccaa8966da78
Parents: 952531e d509ef1
Author: Om <bi...@gmail.com>
Authored: Tue Mar 18 18:28:09 2014 -0700
Committer: Om <bi...@gmail.com>
Committed: Tue Mar 18 18:28:09 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |   18 +-
 KEYS                                            |  141 +-
 LICENSE.pb                                      |  203 ++
 NOTICE                                          |    2 +-
 NOTICE.pb                                       |    9 +
 README                                          |  648 ++---
 README.pb                                       |  162 ++
 RELEASE_NOTES                                   |  256 +-
 SVN-TEST.txt                                    |   17 +-
 apache-flex-sdk-installer-config.xml            |  356 +++
 asdoc/build.xml                                 |   43 +-
 asdoc/templates/ASDoc_terms.xml                 |    9 +
 asdoc/templates/class-files.xslt                |    9 +
 asdoc/templates/class-parts.xslt                |   14 +
 asdoc/templates/images/experimental_small.png   |  Bin 0 -> 1485 bytes
 asdoc/templates/style.css                       |    4 +
 asdoc/test/build_test_experimental.xml          |   60 +
 asdoc/test/doc_src/SampleExperimental.as        |   49 +
 bin/fontswf.bat                                 |    2 +-
 build.properties                                |    6 +-
 build.xml                                       |  228 +-
 build/check_sigs.sh                             |   77 +
 build/deploy_release.sh                         |   83 +
 build/deploy_release_candidate.sh               |   83 +
 build/make_release_branch.sh                    |   49 +
 build/sign_and_hash.sh                          |   10 +-
 build/tag_release_candidate.sh                  |   47 +
 flex-sdk-description.xml                        |    6 +-
 frameworks/air-config-template.xml              |  443 ++++
 frameworks/air-config.xml                       |   22 +-
 frameworks/airmobile-config-template.xml        |  365 +++
 frameworks/airmobile-config.xml                 |   20 +-
 frameworks/build.xml                            |   37 +-
 frameworks/downloads.xml                        |  109 +-
 frameworks/experimental-mobile-manifest.xml     |   28 +
 frameworks/flex-config-template.xml             |   30 +-
 frameworks/flex-config.xml                      |   30 +-
 .../src/mx/controls/AdvancedDataGrid.as         |   48 +
 .../src/mx/controls/AdvancedDataGridBaseEx.as   |   45 +-
 .../AdvancedDataGridBase.as                     |    5 +-
 .../AdvancedDataGridColumn.as                   |   39 +-
 .../AdvancedDataGridColumnGroup.as              |   16 +-
 .../AdvancedDataGridGroupItemRenderer.as        |   17 +-
 .../AdvancedDataGridItemRenderer.as             |   45 +-
 .../mx/controls/listClasses/AdvancedListBase.as |    4 +
 .../advancedgrids/src/mx/core/Version.as        |    2 +-
 .../airframework/src/mx/core/Version.as         |    2 +-
 .../projects/airframework/src/mx/core/Window.as |    3 +-
 .../src/mx/core/WindowedApplication.as          |    3 +-
 .../src/mx/core/windowClasses/TitleBar.as       |   25 +-
 .../src/mx/managers/NativeDragManagerImpl.as    |    3 +-
 .../src/mx/skins/halo/WindowCloseButtonSkin.as  |    3 +-
 .../mx/skins/halo/WindowMaximizeButtonSkin.as   |    3 +-
 .../mx/skins/halo/WindowMinimizeButtonSkin.as   |    3 +-
 .../spark/components/windowClasses/TitleBar.as  |   19 +-
 .../projects/airspark/src/spark/core/Version.as |    2 +-
 frameworks/projects/apache/src/core/Version.as  |    2 +-
 .../org/apache/flex/collections/ArrayList.as    |    4 +-
 .../org/apache/flex/collections/VectorList.as   |    4 +-
 .../projects/automation/src/mx/core/Version.as  |    2 +-
 .../automation_agent/src/mx/core/Version.as     |    2 +-
 .../automation_air/src/mx/core/Version.as       |    2 +-
 .../automation_dmv/src/mx/core/Version.as       |    2 +-
 .../src/mx/core/Version.as                      |    2 +-
 .../automation_spark/src/mx/core/Version.as     |    2 +-
 .../automation_spark/src/spark/core/Version.as  |    2 +-
 .../projects/charts/src/mx/charts/AreaChart.as  |   19 +-
 .../charts/src/mx/charts/AxisRenderer.as        |   81 +-
 .../projects/charts/src/mx/charts/BarChart.as   |   17 +-
 .../charts/src/mx/charts/BubbleChart.as         |   19 +-
 .../charts/src/mx/charts/CandlestickChart.as    |   63 +-
 .../charts/src/mx/charts/ColumnChart.as         |   18 +-
 .../projects/charts/src/mx/charts/GridLines.as  |   24 +-
 .../projects/charts/src/mx/charts/HLOCChart.as  |   70 +-
 .../projects/charts/src/mx/charts/LineChart.as  |   60 +-
 .../projects/charts/src/mx/charts/PieChart.as   |   10 +-
 .../projects/charts/src/mx/charts/PlotChart.as  |   78 +-
 .../mx/charts/chartClasses/CartesianChart.as    |    7 +-
 .../src/mx/charts/chartClasses/ChartBase.as     |   15 +-
 .../mx/charts/chartClasses/GraphicsUtilities.as |    2 +-
 .../src/mx/charts/chartClasses/PolarChart.as    |   12 +-
 .../charts/src/mx/charts/series/AreaSeries.as   |   24 +-
 .../charts/src/mx/charts/series/BarSeries.as    |   15 +-
 .../charts/src/mx/charts/series/BubbleSeries.as |   13 +-
 .../src/mx/charts/series/CandlestickSeries.as   |   17 +-
 .../charts/src/mx/charts/series/ColumnSeries.as |   14 +-
 .../charts/src/mx/charts/series/HLOCSeries.as   |   14 +-
 .../charts/src/mx/charts/series/LineSeries.as   |   16 +-
 .../charts/src/mx/charts/series/PieSeries.as    |   16 +-
 .../charts/src/mx/charts/series/PlotSeries.as   |   14 +-
 .../charts/src/mx/charts/styles/HaloDefaults.as |   24 +
 .../projects/charts/src/mx/core/Version.as      |    2 +-
 .../experimental/bundles/zh_CN/alert.properties |    8 +-
 .../projects/experimental/compile-config.xml    |    2 +-
 frameworks/projects/experimental/defaults.css   |   28 +-
 frameworks/projects/experimental/manifest.xml   |    8 +-
 .../experimental/src/ExperimentalClasses.as     |    7 +-
 .../experimental/src/spark/components/Alert.as  |    3 +
 .../src/spark/components/ArrowDirection.as      |   83 -
 .../src/spark/components/BorderDataNavigator.as |    3 +
 .../src/spark/components/CallOut.as             | 1558 ------------
 .../src/spark/components/CallOutButton.as       |  359 ---
 .../src/spark/components/CallOutPosition.as     |   93 -
 .../src/spark/components/ColorPicker.as         |    5 +-
 .../src/spark/components/DataAccordion.as       |   15 +-
 .../src/spark/components/DataNavigator.as       |    9 +-
 .../src/spark/components/DataNavigatorGroup.as  |    5 +-
 .../src/spark/components/InlineScroller.as      |    7 +-
 .../src/spark/components/MaskedTextInput.as     |  623 +++++
 .../experimental/src/spark/components/Menu.as   |    5 +-
 .../src/spark/components/MenuBar.as             |    5 +-
 .../src/spark/components/ProgressBar.as         |    5 +-
 .../itemRenderers/MenuBarItemRenderer.mxml      |   41 +-
 .../itemRenderers/MenuCoreItemRenderer.as       |    2 +
 .../itemRenderers/MenuItemRenderer.mxml         |   41 +-
 .../supportClasses/CallOutDropDownController.as |   78 -
 .../supportClazzes/AnimationTarget.as           |   68 -
 .../src/spark/containers/Accordion.as           |    7 +-
 .../src/spark/containers/DeferredGroup.as       |    9 +-
 .../src/spark/containers/DividedGroup.as        |    5 +-
 .../src/spark/containers/Divider.as             |    6 +-
 .../src/spark/containers/HDividerGroup.as       |    6 +-
 .../src/spark/containers/Navigator.as           |    9 +-
 .../src/spark/containers/NavigatorGroup.as      |    8 +-
 .../src/spark/containers/VDividerGroup.as       |    6 +-
 .../supportClasses/DeferredCreationPolicy.as    |  130 +
 .../supportClazzes/DeferredCreationPolicy.as    |  128 -
 .../src/spark/events/ColorChangeEvent.as        |    6 +-
 .../experimental/src/spark/events/MenuEvent.as  |    5 +-
 .../src/spark/layouts/AccordionLayout.as        |    7 +-
 .../src/spark/layouts/CarouselLayout.as         |    5 +-
 .../src/spark/layouts/CoverflowLayout.as        |    7 +-
 .../src/spark/layouts/InlineScrollerLayout.as   |    7 +-
 .../src/spark/layouts/RolodexLayout.as          |    5 +-
 .../src/spark/layouts/StackLayout.as            |    7 +-
 .../src/spark/layouts/TimeMachineLayout.as      |    5 +-
 .../AnimationNavigatorLayoutBase.as             |    7 +-
 .../layouts/supportClasses/INavigatorLayout.as  |    5 +-
 .../spark/layouts/supportClasses/LayoutAxis.as  |    6 +-
 .../supportClasses/NavigatorLayoutBase.as       |    8 +-
 .../PerspectiveAnimationNavigatorLayoutBase.as  |    5 +-
 .../PerspectiveNavigatorLayoutBase.as           |    5 +-
 .../spark/managers/INavigatorBrowserManager.as  |    5 +-
 .../spark/managers/NavigatorBrowserManager.as   |    7 +-
 .../managers/NavigatorBrowserManagerImpl.as     |    5 +-
 .../experimental/src/spark/skins/AlertSkin.mxml |   41 +-
 .../src/spark/skins/ColorPickerButtonSkin.mxml  |   41 +-
 .../src/spark/skins/ColorPickerSkin.mxml        |   42 +-
 .../src/spark/skins/MenuBarSkin.mxml            |   41 +-
 .../experimental/src/spark/skins/MenuSkin.mxml  |   41 +-
 .../src/spark/skins/ProgressBarSkin.mxml        |   41 +-
 .../src/spark/skins/spark/CallOutSkin.mxml      |  235 --
 .../src/spark/supportClasses/INavigator.as      |    7 +-
 .../src/spark/utils/ColorPickerUtil.as          |    6 +-
 .../examples/MobileGrid_ApplicationExample.mxml |   24 +
 .../renderers/MyActionButtonPartRenderer.as     |   77 +
 .../examples/views/MobileGridView.mxml          |  158 ++
 .../examples/views/MobileGridView2.mxml         |  115 +
 .../assets/images/mobile160/dg_header_asc.png   |  Bin 0 -> 447 bytes
 .../assets/images/mobile160/dg_header_desc.png  |  Bin 0 -> 418 bytes
 .../assets/images/mobile160/dg_header_sep.png   |  Bin 0 -> 201 bytes
 .../images/mobile160/dg_header_shadow.png       |  Bin 0 -> 277 bytes
 .../assets/images/mobile320/dg_header_asc.png   |  Bin 0 -> 527 bytes
 .../assets/images/mobile320/dg_header_desc.png  |  Bin 0 -> 496 bytes
 .../assets/images/mobile320/dg_header_sep.png   |  Bin 0 -> 215 bytes
 .../images/mobile320/dg_header_shadow.png       |  Bin 0 -> 329 bytes
 .../projects/experimental_mobile/build.xml      |  243 ++
 .../experimental_mobile/bundle-config.xml       |   50 +
 .../bundles/da_DK/experimental.properties       |   18 +
 .../bundles/de_CH/experimental.properties       |   18 +
 .../bundles/de_DE/experimental.properties       |   18 +
 .../bundles/el_GR/experimental.properties       |   18 +
 .../bundles/en_AU/experimental.properties       |   18 +
 .../bundles/en_CA/experimental.properties       |   18 +
 .../bundles/en_GB/experimental.properties       |   18 +
 .../bundles/en_US/experimental.properties       |   18 +
 .../bundles/es_ES/experimental.properties       |   18 +
 .../bundles/fi_FI/experimental.properties       |   18 +
 .../bundles/fr_CH/experimental.properties       |   18 +
 .../bundles/fr_FR/experimental.properties       |   18 +
 .../bundles/it_IT/experimental.properties       |   18 +
 .../bundles/ja_JP/experimental.properties       |   18 +
 .../bundles/ko_KR/experimental.properties       |   18 +
 .../bundles/nb_NO/experimental.properties       |   18 +
 .../bundles/nl_NL/experimental.properties       |   18 +
 .../bundles/pt_BR/experimental.properties       |   18 +
 .../bundles/pt_PT/experimental.properties       |   18 +
 .../bundles/ru_RU/experimental.properties       |   18 +
 .../bundles/sv_SE/experimental.properties       |   18 +
 .../bundles/zh_CN/experimental.properties       |   18 +
 .../bundles/zh_TW/experimental.properties       |   18 +
 .../experimental_mobile/compile-config.xml      |   83 +
 .../projects/experimental_mobile/defaults.css   |  138 ++
 .../projects/experimental_mobile/manifest.xml   |   28 +
 .../experimental_mobile/spark-manifest.xml      |   49 +
 .../src/ExperimentalMobileClasses.as            |   34 +
 .../src/spark/components/MobileGrid.as          |  301 +++
 .../itemRenderers/IMobileGridCellRenderer.as    |   72 +
 .../IMobileGridTextCellRenderer.as              |   52 +
 .../MobileGridBitmapCellRenderer.as             |  153 ++
 .../itemRenderers/MobileGridTextCellRenderer.as |  141 ++
 .../supportClasses/ListMultiPartColumnLayout.as |  191 ++
 .../supportClasses/MobileGridColumn.as          |  354 +++
 .../supportClasses/MobileGridHeader.as          |  176 ++
 .../supportClasses/MobileGridRowRenderer.as     |  281 +++
 .../src/spark/events/MobileGridHeaderEvent.as   |   60 +
 .../src/spark/layouts/MobileGridLayout.as       |  115 +
 .../skins/MobileGridHeaderButtonBarSkin.as      |   89 +
 .../spark/skins/MobileGridHeaderButtonSkin.as   |   43 +
 .../skins/MobileGridHeaderFirstButtonSkin.as    |   35 +
 .../src/spark/skins/MobileGridSkin.as           |  177 ++
 .../assets/MobileGridHeaderButton_down.fxg      |   46 +
 .../mobile/assets/MobileGridHeaderButton_up.fxg |   44 +
 .../assets/MobileGridHeaderFirstButton_down.fxg |   34 +
 .../assets/MobileGridHeaderFirstButton_up.fxg   |   32 +
 .../src/spark/utils/MobileGridUtil.as           |   80 +
 frameworks/projects/framework/build.xml         |   13 +-
 .../framework/src/mx/binding/Binding.as         |   28 +-
 .../framework/src/mx/binding/BindingManager.as  |    8 +-
 .../src/mx/collections/ArrayCollection.as       |   18 +-
 .../framework/src/mx/collections/ArrayList.as   |   21 +-
 .../src/mx/collections/ListCollectionView.as    |   21 +-
 .../framework/src/mx/collections/Sort.as        |    5 +-
 .../src/mx/collections/SortFieldCompareTypes.as |    7 +-
 .../src/mx/collections/XMLListAdapter.as        |   20 +-
 .../framework/src/mx/core/FlexVersion.as        |   30 +-
 .../framework/src/mx/core/RuntimeDPIProvider.as |   55 +-
 .../framework/src/mx/core/UIComponent.as        |  480 +++-
 .../projects/framework/src/mx/core/Version.as   |    2 +-
 .../framework/src/mx/effects/EffectManager.as   |    5 +-
 .../framework/src/mx/managers/FocusManager.as   |  125 +-
 .../src/mx/managers/PopUpManagerImpl.as         |   35 +-
 .../systemClasses/ActiveWindowManager.as        |  208 +-
 .../framework/src/mx/resources/LocaleSorter.as  |   68 +-
 .../src/mx/resources/ResourceManager.as         |    8 +-
 .../src/mx/resources/ResourceManagerImpl.as     |   88 +-
 .../framework/src/mx/states/AddItems.as         |  340 ++-
 .../src/mx/styles/CSSStyleDeclaration.as        |   22 +-
 .../framework/src/mx/styles/StyleProtoChain.as  |    7 +-
 .../framework/src/mx/utils/LoaderUtil.as        |   12 +-
 .../framework/src/mx/utils/MatrixUtil.as        |   13 +-
 .../framework/src/mx/utils/MediaQueryParser.as  |  210 +-
 .../projects/framework/src/mx/utils/Platform.as |  314 +++
 .../projects/framework/src/mx/utils/UIDUtil.as  |   69 +-
 .../src/mx/validators/DateValidator.as          |   11 +
 .../projects/mobilecomponents/manifest.xml      |    2 -
 .../src/MobileComponentsClasses.as              |    5 +-
 .../src/MobileComponentsClassesAIR2.as          |    2 +-
 .../src/spark/components/ArrowDirection.as      |   84 -
 .../src/spark/components/Callout.as             | 1669 -------------
 .../src/spark/components/Callout.png            |  Bin 410 -> 0 bytes
 .../src/spark/components/CalloutButton.as       |  807 -------
 .../src/spark/components/CalloutPosition.as     |   96 -
 .../components/ContentBackgroundAppearance.as   |   72 -
 .../src/spark/components/IconItemRenderer.as    |    9 +-
 .../src/spark/components/LabelItemRenderer.as   |   22 +-
 .../supportClasses/IStyleableEditableText.as    |   36 +
 .../supportClasses/ScrollableStageText.as       | 2254 ++++++++++++++++++
 .../supportClasses/StyleableStageText.as        |    7 +-
 .../supportClasses/StyleableTextField.as        |    2 +-
 .../ViewNavigatorApplicationBase.as             |    7 +-
 .../supportClasses/ViewNavigatorBase.as         |   45 +-
 .../spark/core/ContainerDestructionPolicy.as    |   62 -
 .../src/spark/transitions/ViewTransitionBase.as |    4 +-
 .../src/spark/utils/PlatformMobileHelper.as     |   74 +
 frameworks/projects/mobiletheme/defaults.css    |   49 +-
 .../mobiletheme/src/MobileThemeClasses.as       |    5 +-
 .../src/spark/skins/mobile/ActionBarSkin.as     |   10 +
 .../skins/mobile/BeveledActionButtonSkin.as     |    6 +-
 .../spark/skins/mobile/BeveledBackButtonSkin.as |    3 +-
 .../skins/mobile/ButtonBarLastButtonSkin.as     |   12 +-
 .../skins/mobile/ButtonBarMiddleButtonSkin.as   |    6 +-
 .../src/spark/skins/mobile/ButtonSkin.as        |    8 +-
 .../src/spark/skins/mobile/CalloutSkin.as       |   38 +-
 .../src/spark/skins/mobile/CheckBoxSkin.as      |    4 +-
 .../src/spark/skins/mobile/RadioButtonSkin.as   |   46 +
 .../skins/mobile/ScrollingStageTextAreaSkin.as  |   53 +
 .../skins/mobile/ScrollingStageTextInputSkin.as |   53 +
 .../src/spark/skins/mobile/StageTextAreaSkin.as |    3 +-
 .../TabbedViewNavigatorApplicationSkin.as       |    7 +-
 .../TabbedViewNavigatorTabBarFirstTabSkin.as    |   23 +-
 .../TabbedViewNavigatorTabBarLastTabSkin.as     |   36 +-
 .../src/spark/skins/mobile/TextAreaSkin.as      |    3 +-
 .../src/spark/skins/mobile/TextInputSkin.as     |    3 +-
 .../mobile/ViewNavigatorApplicationSkin.as      |    7 +-
 .../skins/mobile/supportClasses/CalloutArrow.as |   46 +-
 .../skins/mobile/supportClasses/MobileSkin.as   |  756 +-----
 .../mobile/supportClasses/StageTextSkinBase.as  |   16 +-
 .../mobile120/assets/BeveledBackButton_down.fxg |   24 +-
 .../mobile120/assets/BeveledBackButton_fill.fxg |    9 +-
 .../mobile120/assets/BeveledBackButton_up.fxg   |   24 +-
 ...edViewNavigatorButtonBarFirstButton_down.fxg |   12 +-
 ...ewNavigatorButtonBarFirstButton_selected.fxg |   12 +-
 ...bbedViewNavigatorButtonBarFirstButton_up.fxg |   12 +-
 ...bedViewNavigatorButtonBarLastButton_down.fxg |   14 +-
 ...iewNavigatorButtonBarLastButton_selected.fxg |   14 +-
 ...abbedViewNavigatorButtonBarLastButton_up.fxg |   14 +-
 .../skins/mobile480/assets/CheckBox_down.fxg    |   96 +-
 .../mobile480/assets/CheckBox_downSymbol.fxg    |   44 +-
 .../assets/CheckBox_downSymbolSelected.fxg      |   44 +-
 .../skins/mobile480/assets/CheckBox_up.fxg      |   80 +-
 .../mobile480/assets/CheckBox_upSymbol.fxg      |   44 +-
 .../assets/CheckBox_upSymbolSelected.fxg        |   44 +-
 .../skins/mobile480/assets/RadioButton_down.fxg |   62 +-
 .../mobile480/assets/RadioButton_downSymbol.fxg |   30 +-
 .../assets/RadioButton_downSymbolSelected.fxg   |   30 +-
 .../skins/mobile480/assets/RadioButton_up.fxg   |   48 +-
 .../mobile480/assets/RadioButton_upSymbol.fxg   |   30 +-
 .../assets/RadioButton_upSymbolSelected.fxg     |   30 +-
 .../skins/mobile640/assets/CheckBox_down.fxg    |   14 +-
 .../mobile640/assets/CheckBox_downSymbol.fxg    |    6 +-
 .../assets/CheckBox_downSymbolSelected.fxg      |   11 +-
 .../skins/mobile640/assets/CheckBox_up.fxg      |   12 +-
 .../mobile640/assets/CheckBox_upSymbol.fxg      |    6 +-
 .../assets/CheckBox_upSymbolSelected.fxg        |    9 +-
 .../skins/mobile640/assets/RadioButton_down.fxg |    8 +-
 .../mobile640/assets/RadioButton_downSymbol.fxg |    4 +-
 .../assets/RadioButton_downSymbolSelected.fxg   |    4 +-
 .../skins/mobile640/assets/RadioButton_up.fxg   |    6 +-
 .../mobile640/assets/RadioButton_upSymbol.fxg   |    4 +-
 .../assets/RadioButton_upSymbolSelected.fxg     |    4 +-
 .../mx/src/mx/controls/CalendarLayout.as        |    2 +-
 .../projects/mx/src/mx/controls/DataGrid.as     |    4 +
 .../projects/mx/src/mx/controls/DateField.as    |   11 +-
 frameworks/projects/mx/src/mx/controls/List.as  |    4 +-
 frameworks/projects/mx/src/mx/controls/Menu.as  |    7 +-
 .../mx/src/mx/controls/PopUpMenuButton.as       |    5 +-
 .../controls/dataGridClasses/DataGridColumn.as  |   50 +-
 .../projects/mx/src/mx/core/Application.as      |    6 +-
 frameworks/projects/mx/src/mx/core/Version.as   |    2 +-
 frameworks/projects/rpc/src/mx/core/Version.as  |    2 +-
 .../projects/rpc/src/mx/rpc/AbstractInvoker.as  |   43 +
 .../projects/rpc/src/mx/rpc/AbstractService.as  |   33 +
 .../rpc/src/mx/rpc/remoting/RemoteObject.as     |    1 +
 .../src/mx/rpc/remoting/mxml/RemoteObject.as    |    1 +
 .../projects/rpc/src/mx/rpc/soap/WebService.as  |    2 +
 .../rpc/src/mx/rpc/soap/mxml/WebService.as      |    1 +
 .../projects/rpc/src/mx/utils/RPCUIDUtil.as     |   65 +-
 frameworks/projects/spark/build.xml             |   11 +-
 frameworks/projects/spark/defaults.css          |   16 +
 frameworks/projects/spark/src/SparkClasses.as   |    4 +
 .../projects/spark/src/mx/core/FTETextField.as  |   31 +-
 .../spark/src/spark/collections/Sort.as         |    6 +-
 .../spark/collections/SortFieldCompareTypes.as  |    7 +-
 .../spark/src/spark/components/Application.as   |   65 +-
 .../src/spark/components/ArrowDirection.as      |   90 +
 .../spark/src/spark/components/BusyIndicator.as |    8 +-
 .../spark/src/spark/components/Callout.as       | 1701 +++++++++++++
 .../spark/src/spark/components/Callout.png      |  Bin 0 -> 410 bytes
 .../spark/src/spark/components/CalloutButton.as |  853 +++++++
 .../src/spark/components/CalloutPosition.as     |  103 +
 .../spark/src/spark/components/CheckBox.as      |  103 +-
 .../spark/src/spark/components/ComboBox.as      |   13 +-
 .../components/ContentBackgroundAppearance.as   |   72 +
 .../spark/src/spark/components/DataGrid.as      |    9 +-
 .../projects/spark/src/spark/components/Grid.as |   56 +-
 .../spark/components/GridColumnHeaderGroup.as   |    6 +-
 .../spark/src/spark/components/Group.as         |   18 +
 .../spark/src/spark/components/HScrollBar.as    |   31 +-
 .../spark/src/spark/components/Label.as         |    5 +
 .../src/spark/components/NumericStepper.as      |    1 +
 .../spark/src/spark/components/PopUpAnchor.as   |   51 +-
 .../src/spark/components/RichEditableText.as    |   23 +-
 .../spark/src/spark/components/Scroller.as      |    2 +-
 .../src/spark/components/SkinnableContainer.as  |   11 +-
 .../spark/src/spark/components/VScrollBar.as    |   38 +-
 .../components/gridClasses/DataGridEditor.as    |   11 +-
 .../spark/components/gridClasses/GridColumn.as  |   15 +-
 .../gridClasses/GridHeaderViewLayout.as         |    6 +-
 .../supportClasses/AnimationTarget.as           |    2 +-
 .../components/supportClasses/ButtonBarBase.as  |   24 +-
 .../supportClasses/DropDownController.as        |   19 +-
 .../components/supportClasses/LabelPlacement.as |   95 +
 .../spark/components/supportClasses/ListBase.as |    2 +-
 .../components/supportClasses/ScrollerLayout.as |   64 +-
 .../src/spark/components/supportClasses/Skin.as |    2 +-
 .../supportClasses/SkinnableComponent.as        |    4 +
 .../supportClasses/SkinnableTextBase.as         |  106 +-
 .../supportClasses/TouchScrollHelper.as         |    3 +-
 .../spark/core/ContainerDestructionPolicy.as    |   62 +
 .../src/spark/core/IProxiedStageTextWrapper.as  |   43 +
 .../projects/spark/src/spark/core/Version.as    |    2 +-
 .../spark/src/spark/layouts/ConstraintLayout.as |   17 +-
 .../supportClasses/LayoutElementHelper.as       |   78 +-
 .../spark/src/spark/primitives/BitmapImage.as   |   19 +-
 .../primitives/supportClasses/GraphicElement.as |  507 ++++
 .../src/spark/skins/ActionScriptSkinBase.as     |  853 +++++++
 .../src/spark/skins/spark/ApplicationSkin.mxml  |   29 +-
 .../spark/src/spark/skins/spark/CalloutSkin.as  |  730 ++++++
 .../src/spark/skins/spark/CheckBoxSkin.mxml     |  153 +-
 .../spark/assets/CalloutContentBackground.fxg   |   51 +
 .../skins/spark/supportClasses/CalloutArrow.as  |  424 ++++
 .../spark/src/spark/utils/MouseEventUtil.as     |    2 +
 .../src/spark/utils/MultiDPIBitmapSource.as     |   28 +
 .../spark_dmv/src/spark/core/Version.as         |    2 +-
 frameworks/projects/tool/src/mx/core/Version.as |    2 +-
 .../projects/tool_air/src/mx/core/Version.as    |    2 +-
 frameworks/spark-manifest.xml                   |    2 +
 ide/addAIRtoSDK.sh                              |   25 +-
 ide/checkAllPlayerGlobals.bat                   |  130 +
 ide/checkAllPlayerGlobals.sh                    |    4 +-
 ide/flashbuilder/config/air-config.xml          |  443 ++++
 ide/flashbuilder/config/airmobile-config.xml    |  365 +++
 ide/flashbuilder/config/flex-config.xml         |  447 ++++
 ide/flashbuilder/makeApacheFlexForIDE.bat       |   27 +-
 ide/flashbuilder/makeApacheFlexForIDE.sh        |   18 +-
 ide/setFlashPlayerVersion.sh                    |   36 +-
 ide/winDownloadPlayerGlobal.vbs                 |   35 +
 installer.properties/de_DE.properties           |  122 +
 installer.properties/el_GR.properties           |  124 +
 installer.properties/en_US.properties           |  124 +
 installer.properties/es_ES.properties           |  124 +
 installer.properties/fr_FR.properties           |  122 +
 installer.properties/ko_KR.properties           |  123 +
 installer.properties/nl_NL.properties           |  127 +
 installer.properties/pt_BR.properties           |  125 +
 installer.xml                                   |  652 +++++
 jenkins.xml                                     |   26 +-
 local-template.properties                       |    4 +-
 modules/asc/build/java/build.xml                |    5 +-
 .../src/java/macromedia/asc/embedding/Main.java |    2 +-
 .../java/macromedia/asc/embedding/Shell.java    |    2 +-
 modules/compiler/build.xml                      |   10 +-
 .../java/flex2/compiler/asdoc/ClassTable.java   |    3 +-
 .../asdoc/TopLevelClassesGenerator.java         |   81 +-
 .../flex2/compiler/asdoc/TopLevelGenerator.java |    8 +-
 .../compiler/common/MxmlConfiguration.java      |    6 +-
 .../flex2/compiler/mxml/lang/StandardDefs.java  |    2 +-
 .../src/java/flex2/tools/ASDoc_da.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_de.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_en.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_es.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_fi.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_fr.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_it.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_ja.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_ko.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_nb.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_nl.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_pt.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_ru.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_sv.properties    |    2 +-
 .../src/java/flex2/tools/ASDoc_zh_CN.properties |    2 +-
 .../src/java/flex2/tools/ASDoc_zh_TW.properties |    2 +-
 .../src/java/flex2/tools/Compc_da.properties    |    2 +-
 .../src/java/flex2/tools/Compc_de.properties    |    2 +-
 .../src/java/flex2/tools/Compc_en.properties    |    2 +-
 .../src/java/flex2/tools/Compc_es.properties    |    2 +-
 .../src/java/flex2/tools/Compc_fi.properties    |    2 +-
 .../src/java/flex2/tools/Compc_fr.properties    |    2 +-
 .../src/java/flex2/tools/Compc_it.properties    |    2 +-
 .../src/java/flex2/tools/Compc_ja.properties    |    2 +-
 .../src/java/flex2/tools/Compc_ko.properties    |    2 +-
 .../src/java/flex2/tools/Compc_nb.properties    |    2 +-
 .../src/java/flex2/tools/Compc_nl.properties    |    2 +-
 .../src/java/flex2/tools/Compc_pt.properties    |    2 +-
 .../src/java/flex2/tools/Compc_ru.properties    |    2 +-
 .../src/java/flex2/tools/Compc_sv.properties    |    2 +-
 .../src/java/flex2/tools/Compc_zh_CN.properties |    2 +-
 .../src/java/flex2/tools/Compc_zh_TW.properties |    2 +-
 .../java/flex2/tools/DigestTool_da.properties   |    2 +-
 .../java/flex2/tools/DigestTool_de.properties   |    2 +-
 .../java/flex2/tools/DigestTool_en.properties   |    2 +-
 .../java/flex2/tools/DigestTool_es.properties   |    2 +-
 .../java/flex2/tools/DigestTool_fi.properties   |    2 +-
 .../java/flex2/tools/DigestTool_fr.properties   |    2 +-
 .../java/flex2/tools/DigestTool_it.properties   |    2 +-
 .../java/flex2/tools/DigestTool_ja.properties   |    2 +-
 .../java/flex2/tools/DigestTool_ko.properties   |    2 +-
 .../java/flex2/tools/DigestTool_nb.properties   |    2 +-
 .../java/flex2/tools/DigestTool_nl.properties   |    2 +-
 .../java/flex2/tools/DigestTool_pt.properties   |    2 +-
 .../java/flex2/tools/DigestTool_ru.properties   |    2 +-
 .../java/flex2/tools/DigestTool_sv.properties   |    2 +-
 .../flex2/tools/DigestTool_zh_CN.properties     |    2 +-
 .../flex2/tools/DigestTool_zh_TW.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_da.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_de.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_en.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_es.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_fi.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_fr.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_it.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_ja.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_ko.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_nb.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_nl.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_pt.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_ru.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_sv.properties     |    2 +-
 .../src/java/flex2/tools/Fcsh_zh_CN.properties  |    2 +-
 .../src/java/flex2/tools/Fcsh_zh_TW.properties  |    2 +-
 .../compiler/src/java/flex2/tools/Mxmlc.java    |    4 +-
 .../src/java/flex2/tools/Mxmlc_da.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_de.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_en.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_es.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_fi.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_fr.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_it.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_ja.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_ko.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_nb.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_nl.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_pt.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_ru.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_sv.properties    |    2 +-
 .../src/java/flex2/tools/Mxmlc_zh_CN.properties |    2 +-
 .../src/java/flex2/tools/Mxmlc_zh_TW.properties |    2 +-
 .../src/java/flex2/tools/VersionInfo.java       |    2 +-
 modules/debugger/build.xml                      |    5 +-
 .../java/flex/tools/debugger/cli/DebugCLI.java  |  292 +--
 .../tools/debugger/cli/ExpressionCache.java     |   68 +-
 .../tools/debugger/cli/ExpressionContext.java   |    8 +-
 .../flex/tools/debugger/cli/Extensions.java     |    9 +-
 .../flex/tools/debugger/cli/fdb_da.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_de.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_en.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_es.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_fi.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_fr.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_it.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_ja.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_ko.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_nb.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_nl.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_pt.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_ru.properties   |    2 +-
 .../flex/tools/debugger/cli/fdb_sv.properties   |    2 +-
 .../tools/debugger/cli/fdb_zh_CN.properties     |    2 +-
 .../tools/debugger/cli/fdb_zh_TW.properties     |    2 +-
 .../src/java/flash/swf/tools/AbcPrinter.java    |  143 +-
 .../java/flash/swf/types/CXFormWithAlpha.java   |    6 +
 .../forks/velocity/runtime/parser/Parser.java   |    4 +-
 .../flex/forks/velocity/texen/Generator.java    |   12 +-
 .../velocity/util/EnumerationIterator.java      |   12 +-
 .../as3/src/mustella/DispatchMouseClickEvent.as |   18 +-
 mustella/as3/src/mustella/DispatchMouseEvent.as |   18 +-
 mustella/as3/src/mustella/FakeSoftKeyboard.as   |    3 +-
 mustella/as3/src/mustella/UnitTester.as         |  496 +++-
 mustella/build.xml                              |   37 +
 mustella/jenkins.sh                             |  156 +-
 mustella/patch_testing_loop.sh                  |   35 +
 mustella/run_mustella_on_git_status.sh          |   37 +
 mustella/test_patch.sh                          |   59 +
 mustella/test_patch_by_email.sh                 |   58 +
 .../GlobalStyles_mxmlOverride_tester.mxml       |    2 +-
 .../tests/Printing/SWFs/FlexPrintJob_Basic.mxml |    1 -
 .../Integration/RTL_Integration_Flex20SWC.mxml  |   50 -
 .../RTL_SparkSkin/SWFs/RTL_Flex20SWCTest.mxml   |   24 -
 .../SWFs/AdvancedDataGridMain_FLEX_32848.mxml   |  130 +
 .../datagrid_textSelectedColor_singleCell.png   |  Bin 0 -> 11609 bytes
 .../datagrid_textSelectedColor_singleRow.png    |  Bin 0 -> 7133 bytes
 .../advanceddatagrid_styles_FLEX_32848.mxml     |   70 +
 .../Properties/Tree_PropertiesDragDrop.mxml     |    8 +-
 .../Tree_PropertiesDragDrop_spark.mxml          |    8 +-
 .../Properties/baselines/Tree_DP_XML_Copy.png   |  Bin 9657 -> 11936 bytes
 .../baselines/Tree_DP_XML_Copy_spark.png        |  Bin 10681 -> 10275 bytes
 .../Properties/CallOutButton_Basic.mxml         |  564 -----
 .../baselines/calloutbutton_afterAfter.png      |  Bin 38142 -> 0 bytes
 .../baselines/calloutbutton_afterAuto.png       |  Bin 37292 -> 0 bytes
 .../baselines/calloutbutton_afterBefore.png     |  Bin 38303 -> 0 bytes
 .../baselines/calloutbutton_afterEnd.png        |  Bin 37563 -> 0 bytes
 .../baselines/calloutbutton_afterMiddle.png     |  Bin 37746 -> 0 bytes
 .../baselines/calloutbutton_afterStart.png      |  Bin 37087 -> 0 bytes
 .../baselines/calloutbutton_autoAfter.png       |  Bin 37935 -> 0 bytes
 .../baselines/calloutbutton_autoAuto.png        |  Bin 38849 -> 0 bytes
 .../baselines/calloutbutton_autoBefore.png      |  Bin 39105 -> 0 bytes
 .../baselines/calloutbutton_autoEnd.png         |  Bin 38015 -> 0 bytes
 .../baselines/calloutbutton_autoMiddle.png      |  Bin 38110 -> 0 bytes
 .../baselines/calloutbutton_autoStart.png       |  Bin 37248 -> 0 bytes
 .../baselines/calloutbutton_beforeAfter.png     |  Bin 38693 -> 0 bytes
 .../baselines/calloutbutton_beforeAuto.png      |  Bin 38632 -> 0 bytes
 .../baselines/calloutbutton_beforeBefore.png    |  Bin 40032 -> 0 bytes
 .../baselines/calloutbutton_beforeEnd.png       |  Bin 38917 -> 0 bytes
 .../baselines/calloutbutton_beforeMiddle.png    |  Bin 38850 -> 0 bytes
 .../baselines/calloutbutton_beforeStart.png     |  Bin 38058 -> 0 bytes
 .../baselines/calloutbutton_click.png           |  Bin 37275 -> 0 bytes
 .../baselines/calloutbutton_endAfter.png        |  Bin 38480 -> 0 bytes
 .../baselines/calloutbutton_endAuto.png         |  Bin 39207 -> 0 bytes
 .../baselines/calloutbutton_endBefore.png       |  Bin 39563 -> 0 bytes
 .../baselines/calloutbutton_endEnd.png          |  Bin 38614 -> 0 bytes
 .../baselines/calloutbutton_endMiddle.png       |  Bin 38325 -> 0 bytes
 .../baselines/calloutbutton_endStart.png        |  Bin 38037 -> 0 bytes
 .../baselines/calloutbutton_middleAfter.png     |  Bin 39173 -> 0 bytes
 .../baselines/calloutbutton_middleAuto.png      |  Bin 39906 -> 0 bytes
 .../baselines/calloutbutton_middleBefore.png    |  Bin 40471 -> 0 bytes
 .../baselines/calloutbutton_middleEnd.png       |  Bin 41244 -> 0 bytes
 .../baselines/calloutbutton_middleMiddle.png    |  Bin 39412 -> 0 bytes
 .../baselines/calloutbutton_middleStart.png     |  Bin 39408 -> 0 bytes
 .../Properties/baselines/calloutbutton_over.png |  Bin 36808 -> 0 bytes
 .../baselines/calloutbutton_startAfter.png      |  Bin 39745 -> 0 bytes
 .../baselines/calloutbutton_startAuto.png       |  Bin 40580 -> 0 bytes
 .../baselines/calloutbutton_startBefore.png     |  Bin 40545 -> 0 bytes
 .../baselines/calloutbutton_startEnd.png        |  Bin 39799 -> 0 bytes
 .../baselines/calloutbutton_startMiddle.png     |  Bin 39379 -> 0 bytes
 .../baselines/calloutbutton_startStart.png      |  Bin 38803 -> 0 bytes
 .../CallOutButton/SWFs/CallOutButton_Main.mxml  |  269 ---
 .../CallOutButton/SWFs/assets/help.png          |  Bin 3081 -> 0 bytes
 .../DataGrid_requireSelection_test001.mxml      |    2 +-
 .../ClassSelector_160dpi@android_240ppi.png     |  Bin 2094 -> 2100 bytes
 ...tor_160dpi_NoDefaultStyle@android_240ppi.png |  Bin 2045 -> 2041 bytes
 ...Selector_160dpi_OR_320dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 .../ClassSelector_240dpi@android_240ppi.png     |  Bin 2364 -> 2369 bytes
 .../ClassSelector_320dpi@android_240ppi.png     |  Bin 2094 -> 2100 bytes
 ...assSelector_Android160dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...assSelector_Android240dpi@android_240ppi.png |  Bin 2483 -> 2482 bytes
 ...assSelector_Android320dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 .../ClassSelector_Android@android_240ppi.png    |  Bin 2202 -> 2197 bytes
 ...pecifiedAfterQuery_240dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...lassSelector_IPHONE160dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...ONE160dpi_OR_IPHONE320dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...lassSelector_IPHONE320dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 .../ClassSelector_IPHONE@android_240ppi.png     |  Bin 2094 -> 2100 bytes
 .../ClassSelector_InvalidDPI@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...ssSelector_InvalidFeature@android_240ppi.png |  Bin 2094 -> 2100 bytes
 .../ClassSelector_InvalidOS@android_240ppi.png  |  Bin 2094 -> 2100 bytes
 ...sSelector_LowercaseIPHONE@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...sSelector_MediaAll_240dpi@android_240ppi.png |  Bin 2364 -> 2369 bytes
 ...ector_MediaAll_NoFeatures@android_240ppi.png |  Bin 2202 -> 2197 bytes
 ...or_MediaOnlyScreen_240dpi@android_240ppi.png |  Bin 2364 -> 2369 bytes
 ...lector_MediaScreen_240dpi@android_240ppi.png |  Bin 2364 -> 2369 bytes
 ...or_MediaScreen_NoFeatures@android_240ppi.png |  Bin 2202 -> 2197 bytes
 ...ector_MediaUnknown_240dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 .../ClassSelector_MissingDPI@android_240ppi.png |  Bin 2082 -> 2089 bytes
 .../ClassSelector_MissingOS@android_240ppi.png  |  Bin 2242 -> 2230 bytes
 ...sSelector_MultipleQueries@android_240ppi.png |  Bin 2483 -> 2482 bytes
 ...ltipleQueriesEvaluateTrue@android_240ppi.png |  Bin 2242 -> 2230 bytes
 ...lector_NOT_InvalidFeature@android_240ppi.png |  Bin 2082 -> 2089 bytes
 ...ector_NOT_MediaAll_240dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...r_NOT_MediaAll_NoFeatures@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...iaScreen_160dpi_OR_320dpi@android_240ppi.png |  Bin 2387 -> 2390 bytes
 ...or_NOT_MediaScreen_240dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...MediaScreen_Android240dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...ONE160dpi_OR_IPHONE320dpi@android_240ppi.png |  Bin 2500 -> 2500 bytes
 ...OT_MediaScreen_NoFeatures@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...r_NOT_MediaUnknown_240dpi@android_240ppi.png |  Bin 2364 -> 2369 bytes
 ...sSelector_NoQuotesAndroid@android_240ppi.png |  Bin 2202 -> 2197 bytes
 .../ClassSelector_QNX160dpi@android_240ppi.png  |  Bin 2094 -> 2100 bytes
 .../ClassSelector_QNX@android_240ppi.png        |  Bin 2094 -> 2100 bytes
 ...sSelector_QuotesAroundDPI@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...ppercaseAND_Android240dpi@android_240ppi.png |  Bin 2483 -> 2482 bytes
 ...Selector_UppercaseAndroid@android_240ppi.png |  Bin 2202 -> 2197 bytes
 ...ercaseFeatureName_Android@android_240ppi.png |  Bin 2202 -> 2197 bytes
 ...ercaseMediaScreen_Android@android_240ppi.png |  Bin 2202 -> 2197 bytes
 ...UppercaseMediaTag_Android@android_240ppi.png |  Bin 2202 -> 2197 bytes
 ...ercaseNOT_MediaAll_240dpi@android_240ppi.png |  Bin 2094 -> 2100 bytes
 ...LY_MediaOnlyScreen_240dpi@android_240ppi.png |  Bin 2364 -> 2369 bytes
 ...lStylesheet_ClassSelector@android_240ppi.png |  Bin 3657 -> 3651 bytes
 ...alStylesheet_TypeSelector@android_240ppi.png |  Bin 3538 -> 3544 bytes
 ...TypeSelector_ButtonStyles@android_240ppi.png |  Bin 2364 -> 2369 bytes
 ...tleLayout_basic_withView3@android_240ppi.png |  Bin 5100 -> 5106 bytes
 ...yout_horizontal_withView3@android_240ppi.png |  Bin 3628 -> 3633 bytes
 ...itleLayout_tile_withView3@android_240ppi.png |  Bin 5100 -> 5106 bytes
 ...Layout_vertical_withView3@android_240ppi.png |  Bin 3162 -> 3162 bytes
 .../tests/baselines/isModal@android_240ppi.png  |  Bin 19286 -> 18970 bytes
 .../SPUC_KeyboardEffects_Callout.mxml           |   28 +-
 .../baselines/Callout_skin@android_240ppi.png   |  Bin 7581 -> 7784 bytes
 .../swfs/skins/MyCalloutSkin.as                 |   37 +-
 ...finedActionBarOverlayLeft@android_240ppi.png |  Bin 2957 -> 2963 bytes
 ...ctionBarOverlayLeftTabbed@android_240ppi.png |  Bin 2181 -> 2963 bytes
 ...inedActionBarOverlayRight@android_240ppi.png |  Bin 2957 -> 2963 bytes
 ...tionBarOverlayRightTabbed@android_240ppi.png |  Bin 2181 -> 2963 bytes
 ...rientationInLandscapeLeft@android_240ppi.png |  Bin 1827 -> 1804 bytes
 ...ientationInLandscapeRight@android_240ppi.png |  Bin 1827 -> 1804 bytes
 ...tes_ActionLayout_Vertical@android_240ppi.png |  Bin 6968 -> 6960 bytes
 ...NavigationLayout_Vertical@android_240ppi.png |  Bin 6589 -> 6587 bytes
 ...ates_TitleLayout_Vertical@android_240ppi.png |  Bin 6530 -> 6532 bytes
 ...on_actionContent_ManyEArr@android_240ppi.png |  Bin 3875 -> 3863 bytes
 ...n_actionLayout_tileLayout@android_240ppi.png |  Bin 6814 -> 6815 bytes
 ...avigationContent_ManyEArr@android_240ppi.png |  Bin 4844 -> 4838 bytes
 ...vigationLayout_tileLayout@android_240ppi.png |  Bin 6782 -> 6786 bytes
 ...ion_titleContent_ManyEArr@android_240ppi.png |  Bin 5417 -> 5413 bytes
 ...tion_titleContent_OneEArr@android_240ppi.png |  Bin 3081 -> 3099 bytes
 ...tion_titleContent_TwoEArr@android_240ppi.png |  Bin 3775 -> 3781 bytes
 ...n_titleLayout_basicLayout@android_240ppi.png |  Bin 4242 -> 4246 bytes
 ...ation_titleLayout_default@android_240ppi.png |  Bin 3775 -> 3781 bytes
 ...on_titleLayout_tileLayout@android_240ppi.png |  Bin 7492 -> 7497 bytes
 ...itleLayout_verticalLayout@android_240ppi.png |  Bin 4383 -> 4382 bytes
 ...Application_title_runtime@android_240ppi.png |  Bin 1945 -> 1944 bytes
 ...cation_title_runtime_null@android_240ppi.png |  Bin 1945 -> 1944 bytes
 ...itleContent_1ElementArray@android_240ppi.png |  Bin 2018 -> 2021 bytes
 ...itleContent_2ElementArray@android_240ppi.png |  Bin 2500 -> 2508 bytes
 ...itleContent_8ElementArray@android_240ppi.png |  Bin 4759 -> 4764 bytes
 ...r_TitleLayout_BasicLayout@android_240ppi.png |  Bin 2456 -> 2457 bytes
 ...ar_TitleLayout_TileLayout@android_240ppi.png |  Bin 5458 -> 5463 bytes
 ...yout_TitleContent_Padding@android_240ppi.png |  Bin 2820 -> 2831 bytes
 ...itleLayout_VerticalLayout@android_240ppi.png |  Bin 4508 -> 4526 bytes
 ...or_actionContent_ManyEArr@android_240ppi.png |  Bin 3875 -> 3863 bytes
 ...avigationContent_ManyEArr@android_240ppi.png |  Bin 4844 -> 4838 bytes
 ...vigationContent_MobileArr@android_240ppi.png |  Bin 1710 -> 1726 bytes
 ...tor_titleContent_ManyEArr@android_240ppi.png |  Bin 5417 -> 5413 bytes
 ...ator_titleContent_OneEArr@android_240ppi.png |  Bin 3081 -> 3099 bytes
 ...ator_titleContent_TwoEArr@android_240ppi.png |  Bin 3775 -> 3781 bytes
 ...vigator_titleLayout_basic@android_240ppi.png |  Bin 4242 -> 4768 bytes
 ...gator_titleLayout_default@android_240ppi.png |  Bin 4215 -> 4225 bytes
 ...avigator_titleLayout_tile@android_240ppi.png |  Bin 4242 -> 4768 bytes
 ...yout_titleContent_padding@android_240ppi.png |  Bin 4215 -> 4225 bytes
 ...ator_titleLayout_vertical@android_240ppi.png |  Bin 3378 -> 4382 bytes
 ...Bar_ViewNavigator_visible@android_240ppi.png |  Bin 3081 -> 3099 bytes
 .../ActionBar_FocusColor@android_240ppi.png     |  Bin 1020 -> 1021 bytes
 ...isplay_TextDecoration@android_240ppi.png.xml |   56 +-
 ...Mobile_Button_events_move@android_240ppi.png |  Bin 2572 -> 2560 bytes
 ..._integration_default_btn1@android_240ppi.png |  Bin 1431 -> 1430 bytes
 ..._integration_default_btn2@android_240ppi.png |  Bin 921 -> 918 bytes
 ..._integration_default_btn4@android_240ppi.png |  Bin 668 -> 671 bytes
 ..._integration_default_btn5@android_240ppi.png |  Bin 1591 -> 1584 bytes
 ..._integration_default_btn6@android_240ppi.png |  Bin 1168 -> 1174 bytes
 ...n_integration_noIcon_btn6@android_240ppi.png |  Bin 1622 -> 1619 bytes
 ...n_integration_state1_btn1@android_240ppi.png |  Bin 3101 -> 3098 bytes
 ...n_integration_state1_btn2@android_240ppi.png |  Bin 668 -> 671 bytes
 ...n_integration_state1_btn3@android_240ppi.png |  Bin 1589 -> 1585 bytes
 ...n_integration_state1_btn4@android_240ppi.png |  Bin 1291 -> 1286 bytes
 ...n_integration_state1_btn5@android_240ppi.png |  Bin 1532 -> 1528 bytes
 ...n_integration_state1_btn6@android_240ppi.png |  Bin 2398 -> 2387 bytes
 ...ation_default_state_label@android_240ppi.png |  Bin 1724 -> 1724 bytes
 ...rom_includeIn_state_label@android_240ppi.png |  Bin 1862 -> 1854 bytes
 ...ration_state1_state_click@android_240ppi.png |  Bin 1646 -> 1640 bytes
 ...1_state_label_chromeColor@android_240ppi.png |  Bin 1682 -> 1675 bytes
 ...ration_state2_state_click@android_240ppi.png |  Bin 1707 -> 1703 bytes
 ...2_state_label_chromeColor@android_240ppi.png |  Bin 1744 -> 1738 bytes
 ...tton_Change_label_runtime@android_240ppi.png |  Bin 3640 -> 3624 bytes
 ...n_Changing_label_property@android_240ppi.png |  Bin 3183 -> 3172 bytes
 ...xWidth_property_10_to_100@android_240ppi.png |  Bin 1376 -> 1378 bytes
 ...ng_height_less_than_label@android_240ppi.png |  Bin 542 -> 515 bytes
 ..._Checking_height_property@android_240ppi.png |  Bin 1654 -> 1655 bytes
 ...n_Checking_label_property@android_240ppi.png |  Bin 1733 -> 1728 bytes
 ...king_maxWidth_property_10@android_240ppi.png |  Bin 396 -> 376 bytes
 ...ng_minHeight_property_100@android_240ppi.png |  Bin 626 -> 621 bytes
 ...ing_minWidth_property_100@android_240ppi.png |  Bin 630 -> 626 bytes
 ...ton_Checking_neg5point6_x@android_240ppi.png |  Bin 2704 -> 2721 bytes
 ...ton_Checking_neg5point6_y@android_240ppi.png |  Bin 2651 -> 2656 bytes
 ..._percentHeight_property_0@android_240ppi.png |  Bin 2606 -> 2593 bytes
 ...ercentHeight_property_100@android_240ppi.png |  Bin 2695 -> 2686 bytes
 ..._percentHeight_property_1@android_240ppi.png |  Bin 2606 -> 2593 bytes
 ...percentHeight_property_50@android_240ppi.png |  Bin 2679 -> 2667 bytes
 ...ercentHeight_property_100@android_240ppi.png |  Bin 783 -> 776 bytes
 ...g_percentWidth_property_0@android_240ppi.png |  Bin 1332 -> 1328 bytes
 ...percentWidth_property_100@android_240ppi.png |  Bin 2599 -> 2595 bytes
 ...g_percentWidth_property_1@android_240ppi.png |  Bin 1332 -> 1328 bytes
 ..._percentWidth_property_50@android_240ppi.png |  Bin 2038 -> 2035 bytes
 ...hecking_scaleX_2_property@android_240ppi.png |  Bin 3063 -> 3060 bytes
 ..._scaleX_point565_property@android_240ppi.png |  Bin 1885 -> 1901 bytes
 ...ng_scaleX_point5_property@android_240ppi.png |  Bin 1801 -> 1809 bytes
 ...hecking_scaleY_2_property@android_240ppi.png |  Bin 3821 -> 3835 bytes
 ..._scaleY_point565_property@android_240ppi.png |  Bin 1737 -> 1753 bytes
 ...ng_scaleY_point5_property@android_240ppi.png |  Bin 1552 -> 1564 bytes
 ...ecking_styleName_property@android_240ppi.png |  Bin 3211 -> 3202 bytes
 ...ng_visible_false_property@android_240ppi.png |  Bin 4809 -> 4802 bytes
 ...le_true_property_visually@android_240ppi.png |  Bin 1733 -> 1728 bytes
 ...Button_Checking_width_100@android_240ppi.png |  Bin 1369 -> 1367 bytes
 ...n_Checking_width_26point5@android_240ppi.png |  Bin 581 -> 583 bytes
 ..._Button_Checking_width_50@android_240ppi.png |  Bin 933 -> 929 bytes
 ...bile_Button_Checking_x_50@android_240ppi.png |  Bin 2739 -> 2730 bytes
 ...bile_Button_Checking_y_56@android_240ppi.png |  Bin 2816 -> 2807 bytes
 ...ile_Button_alpha_property@android_240ppi.png |  Bin 1715 -> 1725 bytes
 ...ner_scaleX_scaleY_point33@android_240ppi.png |  Bin 1039 -> 1036 bytes
 ...le_Button_emphasized_true@android_240ppi.png |  Bin 1776 -> 1779 bytes
 ...on_enabled_false_property@android_240ppi.png |  Bin 1699 -> 1706 bytes
 ...e_Button_height_width_300@android_240ppi.png |  Bin 2796 -> 2790 bytes
 ...ile_Button_icon_alpha_0.5@android_240ppi.png |  Bin 2765 -> 2754 bytes
 ...bel_height_less_than_icon@android_240ppi.png |  Bin 288 -> 253 bytes
 ...abel_width_less_than_icon@android_240ppi.png |  Bin 444 -> 422 bytes
 ...e_Button_icon_as_childTag@android_240ppi.png |  Bin 4113 -> 4125 bytes
 ...utton_icon_down_alpha_0.5@android_240ppi.png |  Bin 2875 -> 2871 bytes
 ...tton_icon_emphasized_true@android_240ppi.png |  Bin 2799 -> 2792 bytes
 ...tton_icon_height_increase@android_240ppi.png |  Bin 1936 -> 1931 bytes
 ...con_height_less_than_icon@android_240ppi.png |  Bin 276 -> 242 bytes
 ...icon_label_change_runtime@android_240ppi.png |  Bin 3374 -> 3353 bytes
 ...bile_Button_icon_scaleX_2@android_240ppi.png |  Bin 1095 -> 1078 bytes
 ...Button_icon_scaleX_point5@android_240ppi.png |  Bin 753 -> 755 bytes
 ...bile_Button_icon_scaleY_2@android_240ppi.png |  Bin 1203 -> 1215 bytes
 ...Button_icon_scaleY_point5@android_240ppi.png |  Bin 541 -> 551 bytes
 ...utton_icon_width_increase@android_240ppi.png |  Bin 1924 -> 1905 bytes
 ...icon_width_less_than_icon@android_240ppi.png |  Bin 417 -> 392 bytes
 ..._icon_with_label_scaleX_2@android_240ppi.png |  Bin 2422 -> 2408 bytes
 ..._with_label_scaleX_point5@android_240ppi.png |  Bin 1486 -> 1484 bytes
 ...bel_scaleX_scaleY_1point5@android_240ppi.png |  Bin 2893 -> 2895 bytes
 ..._icon_with_label_scaleY_2@android_240ppi.png |  Bin 2832 -> 2822 bytes
 ..._with_label_scaleY_point5@android_240ppi.png |  Bin 1154 -> 1165 bytes
 ..._with_label_visible_false@android_240ppi.png |  Bin 1820 -> 1811 bytes
 .../Mobile_Button_no_label@android_240ppi.png   |  Bin 566 -> 562 bytes
 ...Button_rotationX_property@android_240ppi.png |  Bin 3937 -> 3918 bytes
 ...Button_rotationY_property@android_240ppi.png |  Bin 4825 -> 4831 bytes
 ...Button_rotationZ_property@android_240ppi.png |  Bin 4374 -> 4374 bytes
 ..._Button_rotation_property@android_240ppi.png |  Bin 4374 -> 4374 bytes
 ...le_Button_scaleZ_property@android_240ppi.png |  Bin 2616 -> 2661 bytes
 ...ghlighting_false_property@android_240ppi.png |  Bin 1733 -> 1728 bytes
 ...ighlighting_true_property@android_240ppi.png |  Bin 2194 -> 2219 bytes
 ...icon_add_after_long_label@android_240ppi.png |  Bin 4314 -> 4299 bytes
 ...con_add_after_short_label@android_240ppi.png |  Bin 1882 -> 1875 bytes
 ...e_button_icon_button_down@android_240ppi.png |  Bin 1324 -> 1333 bytes
 ..._button_icon_change_value@android_240ppi.png |  Bin 1622 -> 1611 bytes
 .../mobile_button_icon_clear@android_240ppi.png |  Bin 577 -> 570 bytes
 ...bile_button_icon_disabled@android_240ppi.png |  Bin 873 -> 855 bytes
 ...ile_button_icon_fxg_class@android_240ppi.png |  Bin 940 -> 930 bytes
 ...button_icon_fxg_component@android_240ppi.png |  Bin 940 -> 930 bytes
 .../mobile_button_icon_gif@android_240ppi.png   |  Bin 745 -> 738 bytes
 .../mobile_button_icon_jpg@android_240ppi.png   |  Bin 1622 -> 1611 bytes
 ...utton_icon_mxml_component@android_240ppi.png |  Bin 1182 -> 1186 bytes
 .../mobile_button_icon_png@android_240ppi.png   |  Bin 907 -> 901 bytes
 .../mobile_button_icon_swf@android_240ppi.png   |  Bin 2135 -> 2126 bytes
 ...on_with_label_button_down@android_240ppi.png |  Bin 2237 -> 2248 bytes
 ...n_with_label_change_value@android_240ppi.png |  Bin 1882 -> 1874 bytes
 ...ton_icon_with_label_clear@android_240ppi.png |  Bin 1568 -> 1557 bytes
 ..._icon_with_label_disabled@android_240ppi.png |  Bin 1755 -> 1748 bytes
 ...h_long_label_change_value@android_240ppi.png |  Bin 3836 -> 3826 bytes
 ...ession_height_measurement@android_240ppi.png |  Bin 1887 -> 1874 bytes
 ...n_style_css_iconPlacement@android_240ppi.png |  Bin 1831 -> 1822 bytes
 ..._css_style_disabled_state@android_240ppi.png |  Bin 1920 -> 1922 bytes
 ...e_down_state_first_button@android_240ppi.png |  Bin 2627 -> 2645 bytes
 ...tyle_upState_first_button@android_240ppi.png |  Bin 2006 -> 1994 bytes
 ...le_up_state_second_button@android_240ppi.png |  Bin 2417 -> 2408 bytes
 ...tyles_accentColor_default@android_240ppi.png |  Bin 2384 -> 2369 bytes
 ...yles_accentColor_disabled@android_240ppi.png |  Bin 1970 -> 1972 bytes
 ...tyles_accentColor_pressed@android_240ppi.png |  Bin 2399 -> 2410 bytes
 ...tyles_accentColor_setInAS@android_240ppi.png |  Bin 1794 -> 1793 bytes
 ...les_accentColor_setInMxml@android_240ppi.png |  Bin 494 -> 495 bytes
 ...e_Button_styles_bottom_10@android_240ppi.png |  Bin 2316 -> 2307 bytes
 ..._Button_styles_color_blue@android_240ppi.png |  Bin 2015 -> 2006 bytes
 ...styles_color_red_setStyle@android_240ppi.png |  Bin 2030 -> 2018 bytes
 ...les_color_styleName_green@android_240ppi.png |  Bin 2027 -> 2019 bytes
 ...n_styles_default_baseline@android_240ppi.png |  Bin 2462 -> 2453 bytes
 ...utton_styles_focusAlpha_0@android_240ppi.png |  Bin 2886 -> 2887 bytes
 ...styles_focusAlpha_1point5@android_240ppi.png |  Bin 3334 -> 3255 bytes
 ...les_focusBlendMode_invert@android_240ppi.png |  Bin 3281 -> 3204 bytes
 ...s_focusBlendMode_subtract@android_240ppi.png |  Bin 3375 -> 3281 bytes
 ...styles_focusColor_default@android_240ppi.png |  Bin 3341 -> 3254 bytes
 ...yles_focusColor_set_in_AS@android_240ppi.png |  Bin 3365 -> 3277 bytes
 ...n_styles_focusThickness_0@android_240ppi.png |  Bin 2903 -> 2903 bytes
 ...n_styles_focusThickness_4@android_240ppi.png |  Bin 3431 -> 3355 bytes
 ...ickness_blendmode_default@android_240ppi.png |  Bin 3341 -> 3254 bytes
 ..._thickness_blendmode_mxml@android_240ppi.png |  Bin 3434 -> 3395 bytes
 ...les_fontFamily_CourierNew@android_240ppi.png |  Bin 2247 -> 2241 bytes
 ...amily_CourierNew_setStyle@android_240ppi.png |  Bin 2247 -> 2241 bytes
 ...yles_fontSetting_disabled@android_240ppi.png |  Bin 2493 -> 2491 bytes
 ...yles_fontSetting_selected@android_240ppi.png |  Bin 3072 -> 3098 bytes
 ...Button_styles_fontSize_18@android_240ppi.png |  Bin 2010 -> 2009 bytes
 ...yles_fontSize_18_setStyle@android_240ppi.png |  Bin 2010 -> 2009 bytes
 ...e_Button_styles_fontStyle@android_240ppi.png |  Bin 2237 -> 2241 bytes
 ...styles_fontStyle_disabled@android_240ppi.png |  Bin 2093 -> 2096 bytes
 ...on_styles_fontWeight_bold@android_240ppi.png |  Bin 2284 -> 2281 bytes
 ..._fontWeight_bold_setStyle@android_240ppi.png |  Bin 2284 -> 2281 bytes
 ...ton_styles_font_styleName@android_240ppi.png |  Bin 1938 -> 1932 bytes
 ...Button_styles_kerning_off@android_240ppi.png |  Bin 1597 -> 1594 bytes
 ..._Button_styles_kerning_on@android_240ppi.png |  Bin 1597 -> 1594 bytes
 ...leading_change_at_runtime@android_240ppi.png |  Bin 2385 -> 2384 bytes
 ...on_styles_leading_default@android_240ppi.png |  Bin 2385 -> 2384 bytes
 ...ile_Button_styles_left_10@android_240ppi.png |  Bin 2342 -> 2335 bytes
 ...Spacing_change_at_runtime@android_240ppi.png |  Bin 3301 -> 3292 bytes
 ...tyles_lineThrough_default@android_240ppi.png |  Bin 2780 -> 2771 bytes
 ...le_Button_styles_right_25@android_240ppi.png |  Bin 2390 -> 2380 bytes
 ...utton_styles_set_baseline@android_240ppi.png |  Bin 2316 -> 2310 bytes
 ...yles_set_horizontalCenter@android_240ppi.png |  Bin 2384 -> 2376 bytes
 ...yles_set_verticalCenter_5@android_240ppi.png |  Bin 2316 -> 2308 bytes
 ...skin_disabled_short_label@android_240ppi.png |  Bin 2062 -> 2060 bytes
 ...d_short_label_chromeColor@android_240ppi.png |  Bin 2501 -> 2498 bytes
 ...yles_skin_normal_no_label@android_240ppi.png |  Bin 471 -> 476 bytes
 ...rmal_no_label_chromeColor@android_240ppi.png |  Bin 471 -> 474 bytes
 ...s_skin_normal_short_label@android_240ppi.png |  Bin 2075 -> 2067 bytes
 ...l_short_label_chromeColor@android_240ppi.png |  Bin 2080 -> 2084 bytes
 ...es_skin_selected_no_label@android_240ppi.png |  Bin 910 -> 937 bytes
 ...cted_no_label_chromeColor@android_240ppi.png |  Bin 884 -> 885 bytes
 ...skin_selected_short_label@android_240ppi.png |  Bin 2648 -> 2668 bytes
 ...d_short_label_chromeColor@android_240ppi.png |  Bin 2584 -> 2570 bytes
 ...bile_Button_styles_top_10@android_240ppi.png |  Bin 2316 -> 2307 bytes
 ...tton_iconPlacement_bottom@android_240ppi.png |  Bin 1872 -> 1860 bytes
 ...ent_bottom_explicitHeight@android_240ppi.png |  Bin 1792 -> 1778 bytes
 ...ement_bottom_label_noIcon@android_240ppi.png |  Bin 1267 -> 1262 bytes
 ...Placement_bottom_to_right@android_240ppi.png |  Bin 3184 -> 3168 bytes
 ..._iconPlacement_clearStyle@android_240ppi.png |  Bin 1797 -> 1783 bytes
 ...Placement_css_selectionID@android_240ppi.png |  Bin 1955 -> 1938 bytes
 ...onPlacement_css_styleName@android_240ppi.png |  Bin 3066 -> 3056 bytes
 ...ton_iconPlacement_default@android_240ppi.png |  Bin 1797 -> 1783 bytes
 ...tton_iconPlacement_inline@android_240ppi.png |  Bin 1591 -> 1579 bytes
 ...button_iconPlacement_left@android_240ppi.png |  Bin 1797 -> 1783 bytes
 ...ement_left_explicitHeight@android_240ppi.png |  Bin 1823 -> 1809 bytes
 ...acement_left_label_noIcon@android_240ppi.png |  Bin 1267 -> 1262 bytes
 ...iconPlacement_left_to_top@android_240ppi.png |  Bin 2189 -> 2190 bytes
 ...utton_iconPlacement_right@android_240ppi.png |  Bin 1789 -> 1777 bytes
 ...ment_right_explicitHeight@android_240ppi.png |  Bin 1859 -> 1848 bytes
 ...cement_right_label_noIcon@android_240ppi.png |  Bin 1267 -> 1262 bytes
 ...on_iconPlacement_setStyle@android_240ppi.png |  Bin 1872 -> 1860 bytes
 ..._button_iconPlacement_top@android_240ppi.png |  Bin 1713 -> 1703 bytes
 ...cement_top_explicitHeight@android_240ppi.png |  Bin 1718 -> 1708 bytes
 ...lacement_top_label_noIcon@android_240ppi.png |  Bin 1267 -> 1262 bytes
 ...icon_accentColor_disabled@android_240ppi.png |  Bin 995 -> 989 bytes
 ...n_icon_accentColor_normal@android_240ppi.png |  Bin 953 -> 950 bytes
 ..._icon_accentColor_pressed@android_240ppi.png |  Bin 1500 -> 1513 bytes
 ...ton_icon_chromeColor_down@android_240ppi.png |  Bin 2540 -> 2555 bytes
 ...utton_icon_chromeColor_up@android_240ppi.png |  Bin 2172 -> 2175 bytes
 ...button_icon_css_styleName@android_240ppi.png |  Bin 2734 -> 2720 bytes
 ...tton_icon_custom_downSkin@android_240ppi.png |  Bin 2296 -> 2283 bytes
 ...button_icon_custom_upSkin@android_240ppi.png |  Bin 2593 -> 2609 bytes
 ...icon_iconPlacement_bottom@android_240ppi.png |  Bin 1872 -> 1860 bytes
 ...n_icon_iconPlacement_left@android_240ppi.png |  Bin 1797 -> 1783 bytes
 ..._icon_iconPlacement_right@android_240ppi.png |  Bin 1789 -> 1777 bytes
 ...on_icon_iconPlacement_top@android_240ppi.png |  Bin 1713 -> 1703 bytes
 ...with_chromeColor_disabled@android_240ppi.png |  Bin 2488 -> 2482 bytes
 ...abel_chromeColor_disabled@android_240ppi.png |  Bin 2258 -> 2263 bytes
 ...th_label_chromeColor_down@android_240ppi.png |  Bin 3613 -> 3630 bytes
 ...with_label_chromeColor_up@android_240ppi.png |  Bin 3240 -> 3237 bytes
 ...ton_icon_with_label_color@android_240ppi.png |  Bin 2420 -> 2410 bytes
 ...el_decrease_letterSpacing@android_240ppi.png |  Bin 3400 -> 3399 bytes
 ...con_with_label_fontFamily@android_240ppi.png |  Bin 2409 -> 2393 bytes
 ...ith_label_fontFamily_down@android_240ppi.png |  Bin 2894 -> 2910 bytes
 ..._icon_with_label_fontSize@android_240ppi.png |  Bin 2468 -> 2460 bytes
 ..._with_label_fontSize_down@android_240ppi.png |  Bin 2960 -> 2979 bytes
 ...icon_with_label_fontStyle@android_240ppi.png |  Bin 2560 -> 2551 bytes
 ...ith_label_fontStyle_dowwn@android_240ppi.png |  Bin 3030 -> 3038 bytes
 ...con_with_label_fontWeight@android_240ppi.png |  Bin 2274 -> 2260 bytes
 ...ith_label_fontWeight_down@android_240ppi.png |  Bin 2736 -> 2752 bytes
 ...el_increase_letterSpacing@android_240ppi.png |  Bin 3623 -> 3606 bytes
 ...with_label_textDecoration@android_240ppi.png |  Bin 2494 -> 2478 bytes
 ...label_textDecoration_down@android_240ppi.png |  Bin 3519 -> 3535 bytes
 .../Properties/TextInput_properties_tester.mxml |    2 +-
 .../ADV_style_method_parent_main_tester.mxml    |    2 +-
 .../Compiler/Compc_Params_Spaces.mxml           |   85 -
 .../SWFs/Compc_Params_Spaces_App.compile        |    2 -
 .../SWFs/Compc_Params_Spaces_App.mxml           |   28 -
 .../Properties/CalloutButton_Basic.mxml         |  660 +++++
 .../baselines/calloutbutton_afterAfter.png      |  Bin 0 -> 38386 bytes
 .../baselines/calloutbutton_afterAuto.png       |  Bin 0 -> 37065 bytes
 .../baselines/calloutbutton_afterBefore.png     |  Bin 0 -> 37733 bytes
 .../baselines/calloutbutton_afterEnd.png        |  Bin 0 -> 37013 bytes
 .../baselines/calloutbutton_afterMiddle.png     |  Bin 0 -> 37245 bytes
 .../baselines/calloutbutton_afterStart.png      |  Bin 0 -> 36916 bytes
 .../baselines/calloutbutton_autoAfter.png       |  Bin 0 -> 37648 bytes
 .../baselines/calloutbutton_autoAuto.png        |  Bin 0 -> 37380 bytes
 .../baselines/calloutbutton_autoBefore.png      |  Bin 0 -> 37592 bytes
 .../baselines/calloutbutton_autoEnd.png         |  Bin 0 -> 36888 bytes
 .../baselines/calloutbutton_autoMiddle.png      |  Bin 0 -> 37327 bytes
 .../baselines/calloutbutton_autoStart.png       |  Bin 0 -> 36726 bytes
 .../baselines/calloutbutton_beforeAfter.png     |  Bin 0 -> 38242 bytes
 .../baselines/calloutbutton_beforeAuto.png      |  Bin 0 -> 37428 bytes
 .../baselines/calloutbutton_beforeBefore.png    |  Bin 0 -> 38638 bytes
 .../baselines/calloutbutton_beforeEnd.png       |  Bin 0 -> 37477 bytes
 .../baselines/calloutbutton_beforeMiddle.png    |  Bin 0 -> 38433 bytes
 .../baselines/calloutbutton_beforeStart.png     |  Bin 0 -> 38264 bytes
 .../baselines/calloutbutton_click.png           |  Bin 0 -> 37971 bytes
 .../baselines/calloutbutton_endAfter.png        |  Bin 0 -> 38600 bytes
 .../baselines/calloutbutton_endAuto.png         |  Bin 0 -> 38777 bytes
 .../baselines/calloutbutton_endBefore.png       |  Bin 0 -> 37336 bytes
 .../baselines/calloutbutton_endEnd.png          |  Bin 0 -> 37497 bytes
 .../baselines/calloutbutton_endMiddle.png       |  Bin 0 -> 38239 bytes
 .../baselines/calloutbutton_endStart.png        |  Bin 0 -> 38543 bytes
 .../baselines/calloutbutton_middleAfter.png     |  Bin 0 -> 40154 bytes
 .../baselines/calloutbutton_middleAuto.png      |  Bin 0 -> 40280 bytes
 .../baselines/calloutbutton_middleBefore.png    |  Bin 0 -> 40226 bytes
 .../baselines/calloutbutton_middleEnd.png       |  Bin 0 -> 40294 bytes
 .../baselines/calloutbutton_middleMiddle.png    |  Bin 0 -> 39501 bytes
 .../baselines/calloutbutton_middleStart.png     |  Bin 0 -> 41539 bytes
 .../Properties/baselines/calloutbutton_over.png |  Bin 0 -> 37130 bytes
 .../baselines/calloutbutton_startAfter.png      |  Bin 0 -> 41939 bytes
 .../baselines/calloutbutton_startAuto.png       |  Bin 0 -> 41513 bytes
 .../baselines/calloutbutton_startBefore.png     |  Bin 0 -> 41344 bytes
 .../baselines/calloutbutton_startEnd.png        |  Bin 0 -> 40073 bytes
 .../baselines/calloutbutton_startMiddle.png     |  Bin 0 -> 39944 bytes
 .../baselines/calloutbutton_startStart.png      |  Bin 0 -> 39893 bytes
 .../CalloutButton/SWFs/CallOutButton_Main.mxml  |  278 +++
 .../CalloutButton/SWFs/assets/help.png          |  Bin 0 -> 3081 bytes
 patch_testing_loop.sh                           |   33 -
 pixelbender.xml                                 |  124 +
 run_mustella_on_git_status.sh                   |   35 -
 test_patch.sh                                   |   57 -
 test_patch_by_email.sh                          |   56 -
 966 files changed, 26052 insertions(+), 10503 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c1435e3d/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
----------------------------------------------------------------------
diff --cc frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
index 5ee87e7,0d948af..2a41a02
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
@@@ -90,9 -90,9 +90,15 @@@ public class ActionBarSkin extends Mobi
          
          switch (applicationDPI)
          {
++<<<<<<< HEAD
 +
 +			case DPIClassification.DPI_640:
 +			{
++=======
+ 			case DPIClassification.DPI_640:
+ 			{
+ 				// Note provisional may need changes
++>>>>>>> develop
  				borderSize = 2;
  				layoutShadowHeight = 12;
  				layoutContentGroupHeight = 172;
@@@ -109,7 -109,7 +115,11 @@@
  				layoutShadowHeight = 9;
  				layoutContentGroupHeight = 130;
  				layoutTitleGroupHorizontalPadding = 40;
++<<<<<<< HEAD
 +				
++=======
+ 
++>>>>>>> develop
  				borderClass = spark.skins.mobile480.assets.ActionBarBackground;
  				
  				break;