diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-02-10 18:35:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-10 18:35:12 +0000 |
| commit | 00c5e4e1908877fea23b1b2aab97f122dba2ceef (patch) | |
| tree | 4cdb939aad907e4994601efd2e7d9107ebd3b229 /core/java/android/content | |
| parent | ee2d6ecdaf5b1f035719b1f0ac5b721a70639c42 (diff) | |
| parent | a928127a74d6ffe9334774e64a4470aedbe6c28b (diff) | |
| download | frameworks_base-00c5e4e1908877fea23b1b2aab97f122dba2ceef.zip frameworks_base-00c5e4e1908877fea23b1b2aab97f122dba2ceef.tar.gz frameworks_base-00c5e4e1908877fea23b1b2aab97f122dba2ceef.tar.bz2 | |
Merge "Set TaskStack config orientation based on dimensions"
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 04777ba..be41a7c 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3083,9 +3083,6 @@ public class PackageParser { a.info.maxRecents = sa.getInt( R.styleable.AndroidManifestActivity_maxRecents, ActivityManager.getDefaultAppRecentsLimitStatic()); - a.info.screenOrientation = sa.getInt( - R.styleable.AndroidManifestActivity_screenOrientation, - ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); a.info.configChanges = sa.getInt(R.styleable.AndroidManifestActivity_configChanges, 0); a.info.softInputMode = sa.getInt( R.styleable.AndroidManifestActivity_windowSoftInputMode, 0); @@ -3113,6 +3110,14 @@ public class PackageParser { a.info.resizeable = sa.getBoolean( R.styleable.AndroidManifestActivity_resizeableActivity, owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.MNC); + if (a.info.resizeable) { + // Fixed screen orientation isn't supported with resizeable activities. + a.info.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; + } else { + a.info.screenOrientation = sa.getInt( + R.styleable.AndroidManifestActivity_screenOrientation, + ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); + } } else { a.info.launchMode = ActivityInfo.LAUNCH_MULTIPLE; a.info.configChanges = 0; |