commit 3a6b2df23950cd64c10dfbb437aa56a99cbce54a
author Michael Chan <mchan@android.com> Wed Jan 20 16:10:29 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 20 16:10:29 2010 -0800
tree 576970a149efac1ae7fe57db173735854b8f74d2
parent 6795dd59aa1a1d78ea0b3c7fc44107f38cae80d7
parent 324ab8489cdc8ad4bff4e366940fa16e455f5933

am 324ab848: Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair

Merge commit '324ab8489cdc8ad4bff4e366940fa16e455f5933' into eclair-plus-aosp

* commit '324ab8489cdc8ad4bff4e366940fa16e455f5933':
  b/2370089 Pop the dock dialog above the keyguard

src/com/android/settings/bluetooth/DockService.java

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 @@
 
         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;