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
This commit is contained in:
Michael Chan
2010-01-25 18:09:45 -08:00
committed by Android Git Automerger

View File

@@ -397,7 +397,7 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
mStartIdAssociatedWithDialog = startId; mStartIdAssociatedWithDialog = startId;
mDialog = ab.create(); mDialog = ab.create();
mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
mDialog.setOnDismissListener(service); mDialog.setOnDismissListener(service);
mDialog.show(); mDialog.show();
return true; return true;