summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2009-11-10 13:14:13 -0800
committerJoe Onorato <joeo@android.com>2009-11-10 19:56:01 -0800
commit2ca0ae7d7c4d5f6b24a1b3d987813cad9ee4197f (patch)
tree0464d636abfd7cd932fbfdb17fbb60ba1ffb7b6e /AndroidManifest.xml
parentff0c2e26ecf3e27571743fb6d11128e948dd91f3 (diff)
downloadandroid_packages_apps_Trebuchet-2ca0ae7d7c4d5f6b24a1b3d987813cad9ee4197f.zip
android_packages_apps_Trebuchet-2ca0ae7d7c4d5f6b24a1b3d987813cad9ee4197f.tar.gz
android_packages_apps_Trebuchet-2ca0ae7d7c4d5f6b24a1b3d987813cad9ee4197f.tar.bz2
Fix bug 2250432 - all apps should dismiss when you power off or phone locks
Also cherry-picks this from launcher 1 Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off Close things out in various ways. This should be done for Launcher2 as well. Change-Id: Id4f1c78e35180b437144c54ddcbf10069cc09071 Conflicts: AndroidManifest.xml src/com/android/launcher2/Launcher.java
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bd9a4de..af66610 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -84,7 +84,8 @@
android:name="WallpaperChooser"
android:label="@string/pick_wallpaper"
android:icon="@drawable/ic_launcher_wallpaper"
- android:screenOrientation="nosensor">
+ android:screenOrientation="nosensor"
+ android:finishOnCloseSystemDialogs="true">
<intent-filter>
<action android:name="android.intent.action.SET_WALLPAPER" />
<category android:name="android.intent.category.DEFAULT" />