diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-04-02 00:51:31 +0000 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-04-02 00:51:34 +0000 |
| commit | c03516c67f87209c0bea574afc73de5191d2bd68 (patch) | |
| tree | 66c6072a4497055132d4edef99f4a18977d6348a | |
| parent | 352f6c8ad0ca855786d17ae76c843f21c365424c (diff) | |
| download | android_frameworks_base-staging/cm-12.1.tar.gz android_frameworks_base-staging/cm-12.1.tar.bz2 android_frameworks_base-staging/cm-12.1.zip | |
Revert "PhoneWindowManager: Clean windows during bootup."staging/cm-12.1
This reverts commit 6a0dc258d9c717beef4bee1eec134bf2f4be9104.
Change-Id: Iacca3dc7b5db1f9f192eb61ecd1aa4fa6496df00
| -rw-r--r-- | core/res/res/drawable/windows.png | bin | 2045 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 4 |
3 files changed, 1 insertions, 4 deletions
diff --git a/core/res/res/drawable/windows.png b/core/res/res/drawable/windows.png Binary files differdeleted file mode 100644 index 81309b9b6aa..00000000000 --- a/core/res/res/drawable/windows.png +++ /dev/null diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1a3999e603b..8ef6298dcf8 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1225,7 +1225,6 @@ <java-symbol type="drawable" name="ic_corp_icon" /> <java-symbol type="drawable" name="ic_corp_statusbar_icon" /> <java-symbol type="drawable" name="emulator_circular_window_overlay" /> - <java-symbol type="drawable" name="windows" /> <java-symbol type="drawable" name="sim_light_blue" /> <java-symbol type="drawable" name="sim_light_green" /> diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 3ff09173fc6..f24ebf6e105 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -6563,7 +6563,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { mBootMsgDialog.setTitle(R.string.android_start_title); } mBootMsgDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); - mBootMsgDialog.setIcon(com.android.internal.R.drawable.windows); mBootMsgDialog.setIndeterminate(true); mBootMsgDialog.getWindow().setType( WindowManager.LayoutParams.TYPE_BOOT_PROGRESS); @@ -6577,8 +6576,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mBootMsgDialog.setCancelable(false); mBootMsgDialog.show(); } - mBootMsgDialog.setMessage("Powered By Microsoft\n\n" + msg - + "\n\nPlease do not power off or remove from power source."); + mBootMsgDialog.setMessage(msg); } }); } |
