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/11/22 02:01:31 UTC

[48/48] git commit: [flex-sdk] [refs/heads/iso7skins] - Merge branch 'develop' into ios7skins

Merge branch 'develop' into ios7skins


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

Branch: refs/heads/iso7skins
Commit: d7b993aa2b1162658398168fd1e626b2588d931f
Parents: 965d6d1 27501dd
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Fri Nov 21 15:29:05 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Fri Nov 21 15:29:05 2014 -0800

----------------------------------------------------------------------
 .gitignore                                      |   2 -
 CONTRIBUTING                                    | 135 ++--
 CONTRIBUTORS                                    |   7 +
 LICENSE                                         |  60 +-
 NOTICE                                          |  29 +-
 README                                          | 766 ++++++++-----------
 RELEASE_NOTES                                   | 114 +++
 build.xml                                       |   1 +
 frameworks/build.xml                            |   3 +
 frameworks/downloads.xml                        |  77 +-
 .../experimental/src/spark/components/Alert.as  |  45 +-
 .../experimental/src/spark/skins/AlertSkin.mxml |   1 +
 frameworks/projects/flatspark/build.xml         | 114 +++
 .../projects/flatspark/compile-config.xml       | 109 +++
 frameworks/projects/flatspark/defaults.css      | 116 +++
 .../flatspark/src/FlatSparkSkinsClasses.as      |  51 ++
 .../assets/fonts/awesome/FontAwesome.otf        | Bin 0 -> 62856 bytes
 .../src/flatspark/assets/fonts/awesome/OFL.txt  |  94 +++
 .../flatspark/assets/fonts/lato/Lato_Black.otf  | Bin 0 -> 47436 bytes
 .../assets/fonts/lato/Lato_Black_Italic.otf     | Bin 0 -> 46100 bytes
 .../flatspark/assets/fonts/lato/Lato_Bold.otf   | Bin 0 -> 48800 bytes
 .../assets/fonts/lato/Lato_Bold_Italic.otf      | Bin 0 -> 47364 bytes
 .../assets/fonts/lato/Lato_Hairline.otf         | Bin 0 -> 46852 bytes
 .../assets/fonts/lato/Lato_Hairline_Italic.otf  | Bin 0 -> 46568 bytes
 .../flatspark/assets/fonts/lato/Lato_Light.otf  | Bin 0 -> 47040 bytes
 .../assets/fonts/lato/Lato_Light_Italic.otf     | Bin 0 -> 47060 bytes
 .../assets/fonts/lato/Lato_Regular.otf          | Bin 0 -> 47088 bytes
 .../assets/fonts/lato/Lato_Regular_Italic.otf   | Bin 0 -> 47356 bytes
 .../src/flatspark/assets/fonts/lato/OFL.txt     |  94 +++
 .../src/flatspark/components/ButtonIcon.as      |  41 +
 .../src/flatspark/components/TextInputIcon.as   |  35 +
 .../src/flatspark/enums/BrandColorEnum.as       |  30 +
 .../src/flatspark/enums/ButtonColorEnum.as      |  59 ++
 .../src/flatspark/enums/ButtonSizeEnum.as       |  31 +
 .../src/flatspark/enums/ColorSwatchEnum.as      |  40 +
 .../flatspark/src/flatspark/enums/SizeEnum.as   |  32 +
 .../src/flatspark/enums/TextInputSizeEnum.as    |  30 +
 .../itemRenderers/DefaultItemRenderer.mxml      |  51 ++
 .../src/flatspark/skins/AlertSkin.mxml          | 230 ++++++
 .../src/flatspark/skins/ButtonIconSkin.mxml     | 191 +++++
 .../src/flatspark/skins/ButtonSkin.mxml         | 184 +++++
 .../src/flatspark/skins/CheckBoxSkin.mxml       | 136 ++++
 .../src/flatspark/skins/ComboBoxButtonSkin.mxml | 108 +++
 .../src/flatspark/skins/ComboBoxSkin.mxml       | 127 +++
 .../flatspark/skins/ComboBoxTextInputSkin.mxml  | 218 ++++++
 .../flatspark/skins/DropDownListButtonSkin.mxml | 109 +++
 .../src/flatspark/skins/DropDownListSkin.mxml   | 143 ++++
 .../src/flatspark/skins/HScrollBarSkin.mxml     |  87 +++
 .../flatspark/skins/HScrollBarThumbSkin.mxml    |  74 ++
 .../flatspark/skins/HScrollBarTrackSkin.mxml    |  71 ++
 .../src/flatspark/skins/PanelSkin.mxml          | 253 ++++++
 .../src/flatspark/skins/ProgressBarSkin.mxml    |  54 ++
 .../src/flatspark/skins/RadioButtonSkin.mxml    | 129 ++++
 .../src/flatspark/skins/ScrollerSkin.mxml       | 106 +++
 .../src/flatspark/skins/TextInputIconSkin.mxml  | 338 ++++++++
 .../src/flatspark/skins/TextInputSkin.mxml      | 330 ++++++++
 .../skins/TitleWindowCloseButtonSkin.mxml       | 118 +++
 .../src/flatspark/skins/TitleWindowSkin.mxml    | 256 +++++++
 .../src/flatspark/skins/VScrollBarSkin.mxml     |  87 +++
 .../flatspark/skins/VScrollBarThumbSkin.mxml    |  74 ++
 .../flatspark/skins/VScrollBarTrackSkin.mxml    |  71 ++
 .../src/flatspark/utils/AwesomeUtils.as         | 399 ++++++++++
 .../flatspark/src/flatspark/utils/ColorUtils.as |  90 +++
 .../flatspark/src/flatspark/utils/ConfigSkin.as |  44 ++
 .../framework/src/mx/binding/Binding.as         |  74 +-
 .../framework/src/mx/binding/Watcher.as         |  56 +-
 .../framework/src/mx/core/RuntimeDPIProvider.as |  51 +-
 .../src/mx/managers/PopUpManagerImpl.as         |  23 +-
 .../framework/src/mx/managers/SystemManager.as  |  10 +-
 .../projects/framework/src/mx/utils/Platform.as |   2 +-
 .../android4/supportClasses/CalloutArrow.as     |   6 +-
 .../skins/mobile/supportClasses/CalloutArrow.as |   6 +-
 .../spark/src/spark/components/DataGroup.as     |  23 +-
 .../spark/src/spark/components/Scroller.as      |  46 +-
 .../components/gridClasses/DataGridEditor.as    |   5 +-
 .../supportClasses/SkinnableTextBase.as         |   2 +-
 .../spark/src/spark/layouts/HorizontalLayout.as |   4 +-
 .../spark/src/spark/layouts/VerticalLayout.as   |   4 +-
 .../skins/spark/supportClasses/CalloutArrow.as  |   6 +-
 .../tests/unitTests/mx/collections/DataNode.as  |  19 +
 ...rarchicalCollectionViewCursor_Basics_Test.as |  19 +
 ...hicalCollectionViewCursor_FLEX_34119_Test.as |  19 +
 ...hicalCollectionViewCursor_FLEX_34424_Test.as |  19 +
 ...hicalCollectionViewCursor_FLEX_34440_Test.as |  19 +
 ...hicalCollectionViewCursor_FLEX_34456_Test.as |  19 +
 ...hicalCollectionViewCursor_FLEX_34458_Test.as |  19 +
 .../HierarchicalCollectionViewTestUtils.as      |  19 +
 .../DataGridEditor_FLEX_34543_Test.as           | 104 +++
 .../src/flex/ant/types/FlexSwcFileSet.java      |   4 +-
 .../Properties/Alert_Properties_Spark.mxml      |   2 +-
 90 files changed, 6033 insertions(+), 741 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d7b993aa/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 58381a3,4ee07d5..1177a2c
--- a/.gitignore
+++ b/.gitignore
@@@ -136,6 -136,5 +136,4 @@@ AIR SDK license.pd
  air-sdk-description.xml
  samples/descriptor-sample.xml
  include/FlashRuntimeExtensions.h
--
- /frameworks/projects/mobiletheme/src/spark/skins/ios7/visualcomps/*.ai
  visualcomps

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d7b993aa/frameworks/projects/framework/src/mx/utils/Platform.as
----------------------------------------------------------------------