diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-09-23 23:27:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-23 23:27:50 -0700 |
| commit | 0fad576cb56669ff070d4cdd571ea220cf43dea4 (patch) | |
| tree | 08601ed71c5a7221d7a99c9620dbd12f25113623 /AndroidManifest.xml | |
| parent | ef83ad69c79069de13202173351183af46036bfd (diff) | |
| parent | ec54997a04307887b709c607808dace00df2f138 (diff) | |
| download | packages_apps_settings-0fad576cb56669ff070d4cdd571ea220cf43dea4.zip packages_apps_settings-0fad576cb56669ff070d4cdd571ea220cf43dea4.tar.gz packages_apps_settings-0fad576cb56669ff070d4cdd571ea220cf43dea4.tar.bz2 | |
am ec54997a: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'ec54997a04307887b709c607808dace00df2f138' into eclair-plus-aosp
* commit 'ec54997a04307887b709c607808dace00df2f138':
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index de34dcd..1700349 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -480,7 +480,8 @@ <activity android:name="ActivityPicker" android:label="@string/activity_picker_label" - android:theme="@*android:style/Theme.Dialog.Alert"> + android:theme="@*android:style/Theme.Dialog.Alert" + android:finishOnCloseSystemDialogs="true"> <intent-filter> <action android:name="android.intent.action.PICK_ACTIVITY" /> <category android:name="android.intent.category.DEFAULT" /> @@ -583,7 +584,8 @@ <!-- Standard picker for widgets --> <activity android:name="AppWidgetPickActivity" android:label="@string/widget_picker_title" - android:theme="@*android:style/Theme.Dialog.Alert"> + android:theme="@*android:style/Theme.Dialog.Alert" + android:finishOnCloseSystemDialogs="true"> <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_PICK" /> <category android:name="android.intent.category.DEFAULT" /> |