You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/02/21 20:40:24 UTC

[1/3] git commit: [flex-sdk] [refs/heads/develop] - Added 640 dpi values

Repository: flex-sdk
Updated Branches:
  refs/heads/develop 3ead8cc1d -> b25dd5049


Added 640 dpi values


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

Branch: refs/heads/develop
Commit: 2b2fe2e61b09a60937ac53f63cffe565fba728d3
Parents: 5dfc698
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Feb 21 22:19:25 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Feb 21 22:19:25 2014 +1100

----------------------------------------------------------------------
 .../mobiletheme/src/spark/skins/mobile/ActionBarSkin.as | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/2b2fe2e6/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
index c7c39b8..d983515 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/mobile/ActionBarSkin.as
@@ -89,6 +89,18 @@ public class ActionBarSkin extends MobileSkin
         
         switch (applicationDPI)
         {
+			case DPIClassification.DPI_640:
+			{
+				// Note provisional may need changes
+				borderSize = 2;
+				layoutShadowHeight = 12;
+				layoutContentGroupHeight = 172;
+				layoutTitleGroupHorizontalPadding = 52;
+				
+				borderClass = spark.skins.mobile640.assets.ActionBarBackground;
+				
+				break;
+			}
 			case DPIClassification.DPI_480:
 			{
 				// Note provisional may need changes


[2/3] git commit: [flex-sdk] [refs/heads/develop] - Merge branch 'release4.12.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk into release4.12.0

Posted by ah...@apache.org.
Merge branch 'release4.12.0' of https://git-wip-us.apache.org/repos/asf/flex-sdk into release4.12.0


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

Branch: refs/heads/develop
Commit: e50c7739d7a43789f9181a05adc8b5d5aa709066
Parents: 2b2fe2e 3ead8cc
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Feb 21 22:19:43 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Feb 21 22:19:43 2014 +1100

----------------------------------------------------------------------
 installer.xml | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[3/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34104 copy swfutils.jar so flex-fontkit will work

Posted by ah...@apache.org.
FLEX-34104 copy swfutils.jar so flex-fontkit will work


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

Branch: refs/heads/develop
Commit: b25dd5049e15d5431351bb677e08c529b66c3f3d
Parents: e50c773
Author: Alex Harui <ah...@apache.org>
Authored: Fri Feb 21 11:38:22 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Feb 21 11:39:00 2014 -0800

----------------------------------------------------------------------
 installer.xml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b25dd504/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 2e9ad0f..bb7bd0e 100644
--- a/installer.xml
+++ b/installer.xml
@@ -557,6 +557,9 @@
         <get src="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/rideau.jar"
         dest="${basedir}/lib/external/optional/rideau.jar"
         verbose="false"/>
+        
+        <!-- fontkit expects swfutils in the same folder -->
+        <copy file="${basedir}/lib/swfutils.jar" tofile="${basedir}/lib/external/optional/swfutils.jar" />
     </target>
 
     <!-- BlazeDS  -->