diff options
| author | Craig Stout <cstout@google.com> | 2014-05-14 16:19:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 16:19:51 +0000 |
| commit | 162043076b201483eaeef5c7c3da0619f26f1b11 (patch) | |
| tree | cfd406157a930a52491e1eb4b9c7548cfe07ce3c /policy | |
| parent | 16fa43a28dcaca0369f95a09981418d07584a75e (diff) | |
| parent | 4c0cb8a526eec87fdba6dc371e21abfa4e993ea0 (diff) | |
| download | frameworks_base-162043076b201483eaeef5c7c3da0619f26f1b11.zip frameworks_base-162043076b201483eaeef5c7c3da0619f26f1b11.tar.gz frameworks_base-162043076b201483eaeef5c7c3da0619f26f1b11.tar.bz2 | |
Merge "AlertDialog and AppError themes for TV."
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index ae6aeee..4ee8103 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4777,9 +4777,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHandler.post(new Runnable() { @Override public void run() { if (mBootMsgDialog == null) { - int theme = mContext.getPackageManager().hasSystemFeature( - PackageManager.FEATURE_WATCH) ? - com.android.internal.R.style.Theme_Micro_Dialog_Alert : 0; + int theme; + if (mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_WATCH)) { + theme = com.android.internal.R.style.Theme_Micro_Dialog_Alert; + } else if (mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_TELEVISION)) { + theme = com.android.internal.R.style.Theme_Leanback_Dialog_Alert; + } else { + theme = 0; + } mBootMsgDialog = new ProgressDialog(mContext, theme) { // This dialog will consume all events coming in to |