Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6b29b8d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "String tweak "upgrading" to "finishing"." into nyc-mr1-dev

parents 81e5dffd a4600cc6

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

services/core/java/com/android/server/am/PreBootBroadcaster.java

+1 −1
Original line number Diff line number Diff line
@@ -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",