summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorVinod Krishnan <vinodkrishnan@google.com>2014-05-01 22:43:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-01 22:43:58 +0000
commit5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253 (patch)
treed8cdcc6915bcfe59042cf8e452416c701fa3fb74 /policy
parentd5e92318b69d8af6d91dc3b51738913595e0f536 (diff)
parentfa8fc41bdc36ef02e0884c785b0a906a80b7ae1d (diff)
downloadframeworks_base-5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253.zip
frameworks_base-5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253.tar.gz
frameworks_base-5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253.tar.bz2
Merge "DialogAlert window changes for Micro" into klp-modular-dev
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java6
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 7128cfa..fce5392 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) {