diff options
| author | Markus Menzel <markusmenzel@gmail.com> | 2016-04-01 07:58:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-01 09:28:24 -0700 |
| commit | 16a065df515225bf4da78df7ccea63ca860b2b20 (patch) | |
| tree | 4213ba0baad5206a1d3df02f7728be32006d75db | |
| parent | 91da43051c6c9a867cc4826504b2c84890cc1206 (diff) | |
| download | frameworks_base-16a065df515225bf4da78df7ccea63ca860b2b20.zip frameworks_base-16a065df515225bf4da78df7ccea63ca860b2b20.tar.gz frameworks_base-16a065df515225bf4da78df7ccea63ca860b2b20.tar.bz2 | |
Revert "PhoneWindowManager: Add window animations for LLS"
This reverts commit 7699100fa82f4b61871f90a9c381ea292b8d3a08.
Change-Id: Ic4ccc3b03099413e5d879d92a7b7e20444a5371e
| -rw-r--r-- | core/res/res/drawable/drumpf_cid.png | bin | 38337 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/values/cm_symbols.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 5 |
3 files changed, 2 insertions, 4 deletions
diff --git a/core/res/res/drawable/drumpf_cid.png b/core/res/res/drawable/drumpf_cid.png Binary files differdeleted file mode 100644 index f44725b..0000000 --- a/core/res/res/drawable/drumpf_cid.png +++ /dev/null diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml index 68d3383..a76b3c2 100644 --- a/core/res/res/values/cm_symbols.xml +++ b/core/res/res/values/cm_symbols.xml @@ -80,7 +80,6 @@ <!-- Privacy Guard --> <java-symbol type="drawable" name="stat_notify_privacy_guard" /> - <java-symbol type="drawable" name="drumpf_cid" /> <java-symbol type="string" name="privacy_guard_notification" /> <java-symbol type="string" name="privacy_guard_notification_detail" /> <java-symbol type="string" name="privacy_guard_dialog_title" /> diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index a259228..9cb969c 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -6997,12 +6997,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { } }; if (mContext.getPackageManager().isUpgrade()) { - mBootMsgDialog.setTitle("Drumpf: \"Make CyanogenMod MOD again\""); + mBootMsgDialog.setTitle(R.string.android_upgrading_title); } else { - mBootMsgDialog.setTitle("Drumpf: \"Make CyanogenMod MOD again\""); + mBootMsgDialog.setTitle(R.string.android_start_title); } mBootMsgDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); - mBootMsgDialog.setIcon(R.drawable.drumpf_cid); mBootMsgDialog.setIndeterminate(true); mBootMsgDialog.getWindow().setType( WindowManager.LayoutParams.TYPE_BOOT_PROGRESS); |
