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

Commit c37e58c3 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge \\\"Add methods for setCarMode()\\\" into nyc-mr1-dev am: 81e5dffd am: 7d1d1a12 

am: d45b0237

Change-Id: Ice45a53b658a36f7dafcf5bf080530160d320bf7
parents 247fc05a d45b0237

core/res/res/values/strings.xml

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