Transferred from the Adobe Open Source Subversion Repository
Transferred from the Adobe Open Source Subversion Repository

Revision: 13957
Author:   jimurphy@adobe.com
Date:     2010-02-03T15:33:52.683841Z

Log Message: 
-----------
Merge /branches/4.0.0 revs 13820,13827,13870,13875,13887,13895,13951 -> trunk

------------------------------------------------------------------------
r13820 | jszeto@adobe.com | 2010-01-27 14:56:58 -0500 (Wed, 27 Jan 2010) | 13 lines

DragManager styleManager fix

http://bugs.adobe.com/jira/browse/SDK-25259 - Calling DragManager.doDrag() inside an AIR application causes a Null 
SDK-25259 Pointer Exception


SDK-25259 
------------------------------------------------------------------------

------------------------------------------------------------------------
r13827 | chaase@adobe.com | 2010-01-27 16:37:25 -0500 (Wed, 27 Jan 2010) | 12 lines

Fixes RTE in Wipe/CrossFade effect. The RTE occurs when these effects are used in an auto-reversing transition in a Sequence effect that has multiple child effects.

The underlying problem is that Sequence mistakenly re-plays effect instances that are already playing. This causes a problem with these 2 effects specifically because the depend on an internal variable that is reset when the effect instance ends. When the instance is double-played, the variable is reset while the other animation is still running for the instance and we end up setting an invalid null value for some target's filters property. 
The quick fix here is simply the RTE protection for the Wipe/CrossFade effects - it notices when it is being asked to replayed and noops that operation (essentially working around the buggy Sequence behavior). It also protects against bad filters values, just in case.

sdk-25234 
------------------------------------------------------------------------

------------------------------------------------------------------------
r13870 | jimurphy@adobe.com | 2010-01-28 23:07:23 -0500 (Thu, 28 Jan 2010) | 3 lines

Fix mpl so it doesn't include automation_agent qtp and qtp_air swcs

https://bugs.adobe.com/jira/browse/FLEXENT-1223
FLEXENT-1223 
------------------------------------------------------------------------

------------------------------------------------------------------------
r13875 | rbhat@adobe.com | 2010-01-29 06:45:38 -0500 (Fri, 29 Jan 2010) | 8 lines

Adding automation-runtimeloading-files template to SDK/template
FLEXENT-1225 
------------------------------------------------------------------------

------------------------------------------------------------------------
r13887 | jimurphy@adobe.com | 2010-01-29 13:46:57 -0500 (Fri, 29 Jan 2010) | 8 lines

ensure that the Air/ApplicationUpdater is included in the build and include AIR in the MPL
 
SDK-25290 SDK-25292
------------------------------------------------------------------------

------------------------------------------------------------------------
r13895 | cframpto@adobe.com | 2010-01-29 16:11:01 -0500 (Fri, 29 Jan 2010) | 12 lines

TLF Build 595.

Build 595
	* Fix 2537642 Bug, TLF Text: htmlText is not Rendered Correctly (importer issue with implied paragraphs)
------------------------------------------------------------------------

------------------------------------------------------------------------
r13951 | rbhat@adobe.com | 2010-02-02 22:17:30 -0500 (Tue, 02 Feb 2010) | 1 line

Added qtp_air_rb.swc for other locales in 4.0.0 branch
------------------------------------------------------------------------

QE notes: 
Doc notes: 
Bugs: 
Reviewer: 
Tests run: checkintests
Is noteworthy for integration:

Modified Paths:
--------------
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/ja_JP/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/conversion/BaseTextLayoutImporter.as</path>
<path kind="file" action="D">/flex/sdk/trunk/frameworks/rsls/textLayout_1.0.0.594.swf</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/4.0.0/frameworks/rsls/textLayout_1.0.0.595.swf" copyfrom-rev="13895" action="A">/flex/sdk/trunk/frameworks/rsls/textLayout_1.0.0.595.swf</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/flex-config.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/zh_tw/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/textLayout.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/nb_NO/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/HowToUpgradeTLF.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/zh_CN/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/air-config.xml</path>
<path kind="dir" action="M">/flex/sdk/trunk</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/ko_KR/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/automation_agent.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/ReleaseNotes.txt</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/it_IT/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/en_US/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/it_IT/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/conversion/HtmlImporter.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/src/flashx/textLayout/BuildInfo.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/qtp.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/sv_SE/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/textLayout/tlf.properties</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/airframework/src/mx/managers/NativeDragManagerImpl.as</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/ja_JP/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/projects/spark/src/spark/effects/supportClasses/AnimateTransitionShaderInstance.as</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/4.0.0/templates/automation-runtimeloading-files/RunTimeLoading.html" copyfrom-rev="13875" action="R">/flex/sdk/trunk/templates/automation-runtimeloading-files/RunTimeLoading.html</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/nb_NO/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/ru_RU/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/zh_tw/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/ru_RU/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/fr_FR/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/es_ES/automation_agent_rb.swc</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/4.0.0/templates/automation-runtimeloading-files/runtimeloading.mxml" copyfrom-rev="13875" action="R">/flex/sdk/trunk/templates/automation-runtimeloading-files/runtimeloading.mxml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/fr_FR/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/es_ES/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/de_DE/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/de_DE/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/da_DK/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/nl_NL/automation_agent_rb.swc</path>
<path kind="dir" copyfrom-path="/flex/sdk/branches/4.0.0/templates/automation-runtimeloading-files" copyfrom-rev="13875" action="A">/flex/sdk/trunk/templates/automation-runtimeloading-files</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/zh_CN/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/build.xml</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/nl_NL/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/da_DK/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/ko_KR/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/pt_BR/automation_agent_rb.swc</path>
<path kind="file" copyfrom-path="/flex/sdk/branches/4.0.0/templates/automation-runtimeloading-files/build.bat" copyfrom-rev="13875" action="R">/flex/sdk/trunk/templates/automation-runtimeloading-files/build.bat</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/pt_BR/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/libs/qtp_air.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/en_US/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/fi_FI/automation_agent_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/fi_FI/qtp_air_rb.swc</path>
<path kind="file" action="M">/flex/sdk/trunk/frameworks/locale/sv_SE/qtp_air_rb.swc</path>

git-svn-id: 7146a936b37d36e51ea0d66f8acbe0b8281bc7b7@1247701 13f79535-47bb-0310-9956-ffa450edef68

SlavaRa/flex-sdk,danteinforno/flex-sdk,adufilie/flex-sdk,SlavaRa/flex-sdk,SlavaRa/flex-sdk,danteinforno/flex-sdk,SlavaRa/flex-sdk,shyamalschandra/flex-sdk,shyamalschandra/flex-sdk,apache/flex-sdk,adufilie/flex-sdk,apache/flex-sdk,danteinforno/flex-sdk,adufilie/flex-sdk,adufilie/flex-sdk,apache/flex-sdk,SlavaRa/flex-sdk,apache/flex-sdk,shyamalschandra/flex-sdk,danteinforno/flex-sdk,shyamalschandra/flex-sdk,shyamalschandra/flex-sdk,adufilie/flex-sdk,shyamalschandra/flex-sdk,adufilie/flex-sdk,danteinforno/flex-sdk,apache/flex-sdk,SlavaRa/flex-sdk,apache/flex-sdk,danteinforno/flex-sdk