Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

String tweak \"upgrading\" to \"finishing\".

Browse Source 
am: a4600cc6d0

Change-Id: Iddb57e1e20e166ea2211a368dd33fec6c08d20c1
This commit is contained in:
Jeff Sharkey
2016-07-30 06:33:51 +00:00
committed by android-build-merger
parent e372b93bef a4600cc6d0
commit 7d1d1a127f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/strings.xml
View File

@@ -2793,8 +2793,8 @@
<!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
<string name="android_upgrading_fstrim">Optimizing storage.</string>
<!-- [CHAR LIMIT=40] Title of notification that is shown when performing a system upgrade. -->
<string name="android_upgrading_notification_title">Android is upgrading</string>
<!-- [CHAR LIMIT=40] Title of notification that is shown when finishing a system upgrade. -->
<string name="android_upgrading_notification_title">Finishing Android update\u2026</string>
<!-- [CHAR LIMIT=200] Body of notification that is shown when performing a system upgrade. -->
<string name="android_upgrading_notification_body">Some apps may not work properly until the upgrade finishes</string>

2
services/core/java/com/android/server/am/PreBootBroadcaster.java
View File

@@ -130,7 +130,7 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
switch (msg.what) {
case MSG_SHOW:
final CharSequence title = context
.getText(R.string.android_upgrading_title);
.getText(R.string.android_upgrading_notification_title);
final Intent intent = new Intent();
intent.setClassName("com.android.settings",