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/08/17 10:24:46 UTC
[47/47] git commit: [flex-sdk] [refs/heads/develop] - Merge
remote-tracking branch 'remotes/origin/develop' into new_android_skins
Merge remote-tracking branch 'remotes/origin/develop' into new_android_skins
Conflicts:
LICENSE
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/815e105a
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/815e105a
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/815e105a
Branch: refs/heads/develop
Commit: 815e105a447e195b0dbfb5433f0f869af22da7dc
Parents: 22d3e19 994deb0
Author: Om <bi...@gmail.com>
Authored: Sun Aug 17 00:43:33 2014 -0700
Committer: Om <bi...@gmail.com>
Committed: Sun Aug 17 00:43:33 2014 -0700
----------------------------------------------------------------------
ApproveSDK.xml | 405 ++++++++++
GIT-TEST.txt | 79 ++
LICENSE | 10 +
NOTICE | 2 +-
README | 45 +-
RELEASE_NOTES | 90 +++
SVN-TEST.txt | 75 --
apache-flex-sdk-installer-config.xml | 797 ++++++++++---------
asdoc/templates/all-classes.xslt | 2 +-
asdoc/templates/class-summary.xslt | 8 +-
asdoc/templates/images/AirIcon12x12.gif | Bin 318 -> 0 bytes
.../P_AlternativeMetadataIndicator_30x28_N.png | Bin 868 -> 415 bytes
build.properties | 6 +-
build.xml | 92 ++-
build/set-version.xml | 10 +-
env-template.properties | 2 +-
frameworks/flex-config-template.xml | 2 +-
.../collections/HierarchicalCollectionView.as | 104 +--
.../HierarchicalCollectionViewCursor.as | 217 +++--
.../src/mx/collections/LeafNodeCursor.as | 7 +-
.../advancedgrids/src/mx/core/Version.as | 2 +-
.../airframework/src/mx/core/Version.as | 2 +-
.../projects/airspark/src/spark/core/Version.as | 2 +-
frameworks/projects/apache/src/core/Version.as | 2 +-
.../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/core/Version.as | 2 +-
.../en_US/mx/controls/examples/assets/phone.flv | Bin 351376 -> 0 bytes
.../mx/effects/examples/SoundEffectExample.mxml | 2 +-
.../en_US/mx/effects/examples/assets/jazz.mp3 | Bin 7380 -> 0 bytes
.../src/mx/collections/XMLListAdapter.as | 2 +-
.../framework/src/mx/core/FlexVersion.as | 16 +-
.../framework/src/mx/core/UIComponent.as | 6 +
.../projects/framework/src/mx/core/Version.as | 2 +-
.../framework/src/mx/managers/FocusManager.as | 27 +-
.../src/mx/managers/ToolTipManagerImpl.as | 32 +
.../src/mx/validators/DateValidator.as | 15 +-
.../src/mx/validators/EmailValidator.as | 10 -
.../framework/src/mx/validators/Validator.as | 5 +-
.../projects/mx/src/mx/containers/Form.as | 8 +
.../projects/mx/src/mx/containers/FormItem.as | 16 +
.../mx/controls/treeClasses/TreeItemRenderer.as | 2 +-
frameworks/projects/mx/src/mx/core/Container.as | 45 ++
frameworks/projects/mx/src/mx/core/Version.as | 2 +-
frameworks/projects/rpc/src/mx/core/Version.as | 2 +-
.../projects/rpc/src/mx/rpc/http/Operation.as | 1 +
.../src/spark/components/RichEditableText.as | 3 +
.../spark/components/gridClasses/GridColumn.as | 43 +
.../components/gridClasses/GridViewLayout.as | 106 ++-
.../supportClasses/DropDownController.as | 9 +-
.../projects/spark/src/spark/core/Version.as | 2 +-
.../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 +-
.../tests/unitTests/mx/collections/DataNode.as | 62 ++
...rarchicalCollectionViewCursor_Basics_Test.as | 241 ++++++
...hicalCollectionViewCursor_FLEX_34119_Test.as | 348 ++++++++
...hicalCollectionViewCursor_FLEX_34424_Test.as | 138 ++++
...hicalCollectionViewCursor_FLEX_34440_Test.as | 125 +++
...hicalCollectionViewCursor_FLEX_34456_Test.as | 163 ++++
...hicalCollectionViewCursor_FLEX_34458_Test.as | 111 +++
.../HierarchicalCollectionViewTestUtils.as | 184 +++++
ide/checkAllPlayerGlobals.sh | 4 +-
ide/flashbuilder/makeApacheFlexForIDE.sh | 25 +-
installer.properties/en_US.properties | 1 +
installer.properties/pl_PL.properties | 125 +++
installer.properties/zh_CN.properties | 125 +++
installer.properties/zh_TW.properties | 125 +++
installer.xml | 41 +-
.../compiler/common/MxmlConfiguration.java | 5 +-
.../src/java/flex2/tools/VersionInfo.java | 2 +-
.../tests/emailValidatorTests.mxml | 16 -
.../tests/emailValidatorTests.mxml | 16 -
.../Danish/tests/emailValidatorTests.mxml | 16 -
.../Dutch/tests/emailValidatorTests.mxml | 16 -
.../Finnish/tests/emailValidatorTests.mxml | 16 -
.../French/tests/emailValidatorTests.mxml | 16 -
.../German/tests/emailValidatorTests.mxml | 16 -
.../Italian/tests/emailValidatorTests.mxml | 16 -
.../JA_EmailValidator_invalidDomainError.png | Bin 2100 -> 0 bytes
.../Japanese/tests/emailValidatorTests.mxml | 16 -
.../Korean/tests/emailValidatorTests.mxml | 16 -
.../Norwegian/tests/emailValidatorTests.mxml | 16 -
.../Portuguese/tests/emailValidatorTests.mxml | 16 -
.../Russian/tests/emailValidatorTests.mxml | 16 -
.../Spanish/tests/emailValidatorTests.mxml | 16 -
.../Swedish/tests/emailValidatorTests.mxml | 16 -
.../DescendantSelectors_main_runtimeCSS.mxml | 2 +
...ancedCSS_descendantSelectors_RuntimeCSS.mxml | 2 +-
...tSelector_basic_noMatch_style_runtimecss.png | Bin 1468 -> 1239 bytes
...ector_basic_noMatch_style_runtimecss@win.png | Bin 1447 -> 1239 bytes
.../Properties/Validators_Date_Properties.mxml | 15 +
.../Validators_Date_Properties_spark.mxml | 15 +
.../Properties/Validators_Email_IPV6.mxml | 82 +-
.../Properties/Validators_Email_IPV6_spark.mxml | 82 +-
.../Properties/Validators_Email_Properties.mxml | 86 +-
.../Validators_Email_Properties_spark.mxml | 74 +-
.../Properties/baselines/invalidDomainError.png | Bin 4918 -> 2746 bytes
.../baselines/invalidDomainError_spark.png | Bin 5439 -> 3009 bytes
.../baselines/ipv6_invalidDomainError.png | Bin 4444 -> 2641 bytes
.../baselines/ipv6_invalidDomainError_spark.png | Bin 4667 -> 2796 bytes
releasecandidate.xml | 616 ++++++++++++++
107 files changed, 4251 insertions(+), 1127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/815e105a/LICENSE
----------------------------------------------------------------------
diff --cc LICENSE
index 4c16ea0,e2cbbe1..99588a0
--- a/LICENSE
+++ b/LICENSE
@@@ -715,7 -715,14 +715,17 @@@ EXHIBIT A -Mozilla Public License
------------------------------------------------------------------------------------------
+ APACHE FLEX SUBCOMPONENTS:
+
+ The Apache Flex SDK includes a number of subcomponents with
+ separate copyright notices and license terms. Your use of the source
+ code for the these subcomponents is subject to the terms and
+ conditions of the following licenses.
+
+ The Open-Sans font is available under Apache License 2.0. For details
+ see frameworks/projects/framework/asdoc/en_US/mx/effects/examples/assets/OpenSans-Regular.ttf
+
+The Roboto-Regular and Roboto-Bold fonts are available under Apache License 2.0.
+For details see frameworks\projects\mobiletheme\src\spark\skins\android4\assets\fonts
+------------------------------------------------------------------------------------------