summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2012-04-23 22:03:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-23 22:03:15 -0700
commit7d254dff8b89bd5b43a8d2f3fe533b092ebd5561 (patch)
tree2cce856dcca52870313f7186e78315f9e87306f2
parenta90835063e59aa2dfa4270b917960b9a045ae491 (diff)
parent1430ad970bfc25bb951234cb0ea4085f758e88eb (diff)
downloadandroid_packages_apps_PackageInstaller-7d254dff8b89bd5b43a8d2f3fe533b092ebd5561.tar.gz
android_packages_apps_PackageInstaller-7d254dff8b89bd5b43a8d2f3fe533b092ebd5561.tar.bz2
android_packages_apps_PackageInstaller-7d254dff8b89bd5b43a8d2f3fe533b092ebd5561.zip
am 1430ad97: Merge "PackageInstaller : Don\'t restart on orientation change"
* commit '1430ad970bfc25bb951234cb0ea4085f758e88eb': PackageInstaller : Don't restart on orientation change
-rw-r--r--AndroidManifest.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index af5fa762..a9ee767f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,7 +13,7 @@
android:allowBackup="false"
android:theme="@android:style/Theme.Holo.DialogWhenLarge.NoActionBar">
<activity android:name=".PackageInstallerActivity"
- android:configChanges="orientation|keyboardHidden"
+ android:configChanges="orientation|keyboardHidden|screenSize"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -31,10 +31,10 @@
</intent-filter>
</activity>
<activity android:name=".InstallAppProgress"
- android:configChanges="orientation|keyboardHidden">
+ android:configChanges="orientation|keyboardHidden|screenSize">
</activity>
<activity android:name=".UninstallerActivity"
- android:configChanges="orientation|keyboardHidden"
+ android:configChanges="orientation|keyboardHidden|screenSize"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />