summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchi Amalapurapu <asuchitra@google.com>2009-11-12 23:17:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-12 23:17:52 -0800
commit4580ed34680b6c00556a8cfe6376345ad66da2f9 (patch)
tree8b4a3680cda95926ace94ede8bf3a8d96811891b
parentb73c48ddfd8a30433707e8259c6ce93440cd1fc3 (diff)
parent46fea03ae38ff3541281fab74df144ac292baf06 (diff)
downloadandroid_packages_apps_PackageInstaller-4580ed34680b6c00556a8cfe6376345ad66da2f9.tar.gz
android_packages_apps_PackageInstaller-4580ed34680b6c00556a8cfe6376345ad66da2f9.tar.bz2
android_packages_apps_PackageInstaller-4580ed34680b6c00556a8cfe6376345ad66da2f9.zip
am 46fea03a: am b7724a51: am ea6db5d5: Ignore orientation changes when installing/uninstalling
Merge commit '46fea03ae38ff3541281fab74df144ac292baf06' * commit '46fea03ae38ff3541281fab74df144ac292baf06': Ignore orientation changes when installing/uninstalling
-rw-r--r--AndroidManifest.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 21131455..ab4562bc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -7,7 +7,8 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
<application android:label="@string/app_name">
- <activity android:name=".PackageInstallerActivity">
+ <activity android:name=".PackageInstallerActivity"
+ android:configChanges="orientation|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
@@ -16,9 +17,11 @@
<data android:mimeType="application/vnd.android.package-archive" />
</intent-filter>
</activity>
- <activity android:name=".InstallAppProgress">
+ <activity android:name=".InstallAppProgress"
+ android:configChanges="orientation|keyboardHidden">
</activity>
- <activity android:name=".UninstallerActivity">
+ <activity android:name=".UninstallerActivity"
+ android:configChanges="orientation|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.DELETE" />
@@ -26,7 +29,8 @@
<data android:scheme="package" />
</intent-filter>
</activity>
- <activity android:name=".UninstallAppProgress">
+ <activity android:name=".UninstallAppProgress"
+ android:configChanges="orientation|keyboardHidden">
</activity>
</application>
</manifest>