diff options
| author | Michael Chan <mchan@android.com> | 2010-01-25 18:09:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-25 18:09:45 -0800 |
| commit | 88d071fce4fa258f5d7002a64b92a2bd73c17501 (patch) | |
| tree | 449e019a12ffa5c909deee5a38fa19d019d88bfc /src/com/android/settings/bluetooth | |
| parent | 7bc9b26b74eed8ecdab353a548c3ac71f777accb (diff) | |
| parent | 3a6b2df23950cd64c10dfbb437aa56a99cbce54a (diff) | |
| download | packages_apps_Settings-88d071fce4fa258f5d7002a64b92a2bd73c17501.zip packages_apps_Settings-88d071fce4fa258f5d7002a64b92a2bd73c17501.tar.gz packages_apps_Settings-88d071fce4fa258f5d7002a64b92a2bd73c17501.tar.bz2 | |
am 3a6b2df2: am 324ab848: Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair
Merge commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a'
* commit '3a6b2df23950cd64c10dfbb437aa56a99cbce54a':
b/2370089 Pop the dock dialog above the keyguard
Diffstat (limited to 'src/com/android/settings/bluetooth')
| -rw-r--r-- | src/com/android/settings/bluetooth/DockService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java index db5bcb8..1425e23 100644 --- a/src/com/android/settings/bluetooth/DockService.java +++ b/src/com/android/settings/bluetooth/DockService.java @@ -397,7 +397,7 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli mStartIdAssociatedWithDialog = startId; mDialog = ab.create(); - mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); + mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); mDialog.setOnDismissListener(service); mDialog.show(); return true; |