diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2014-05-01 22:46:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 22:46:16 +0000 |
| commit | 8e95d9883666e2b4b1ce26b312d09ba42ae37f7a (patch) | |
| tree | ea17e6e804a7adadafbcfbf52d071de5c916eb83 /policy | |
| parent | 2de2e22540441fd02e03abae5bcae8feb873b929 (diff) | |
| parent | 5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253 (diff) | |
| download | frameworks_base-8e95d9883666e2b4b1ce26b312d09ba42ae37f7a.zip frameworks_base-8e95d9883666e2b4b1ce26b312d09ba42ae37f7a.tar.gz frameworks_base-8e95d9883666e2b4b1ce26b312d09ba42ae37f7a.tar.bz2 | |
am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
* commit '5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253':
DialogAlert window changes for Micro
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 2a4e059..cae57ec 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4722,7 +4722,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHandler.post(new Runnable() { @Override public void run() { if (mBootMsgDialog == null) { - mBootMsgDialog = new ProgressDialog(mContext) { + int theme = mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_WATCH) ? + com.android.internal.R.style.Theme_Micro_Dialog_Alert : 0; + + mBootMsgDialog = new ProgressDialog(mContext, theme) { // This dialog will consume all events coming in to // it, to avoid it trying to do things too early in boot. @Override public boolean dispatchKeyEvent(KeyEvent event) { |