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

Commit 5b380af9 authored by Po-Chien Hsueh's avatar Po-Chien Hsueh
Browse files

Replace action button "Uninstall" with "Restart"

When DSU is running, restarting the device will not uninstall the
installed system update.

Bug: 149716233
Test: run DSU install
Change-Id: If4e7b2f5f9123161ae85c0be80069aa600548c74
parent a975b9a9
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -27,10 +27,11 @@
    <string name="notification_action_cancel">Cancel</string>
    <string name="notification_action_cancel">Cancel</string>
    <!-- Action on notification: Discard installation [CHAR LIMIT=16] -->
    <!-- Action on notification: Discard installation [CHAR LIMIT=16] -->
    <string name="notification_action_discard">Discard</string>
    <string name="notification_action_discard">Discard</string>
    <!-- Action on notification: Uninstall Dynamic System [CHAR LIMIT=16] -->
    <string name="notification_action_uninstall">Uninstall</string>
    <!-- Action on notification: Restart to Dynamic System [CHAR LIMIT=16] -->
    <!-- Action on notification: Restart to Dynamic System [CHAR LIMIT=16] -->
    <string name="notification_action_reboot_to_dynsystem">Restart</string>
    <string name="notification_action_reboot_to_dynsystem">Restart</string>
    <!-- Action on notification: Restart to original Android version [CHAR LIMIT=16] -->
    <string name="notification_action_reboot_to_origin">Restart</string>



    <!-- Toast when installed Dynamic System is discarded [CHAR LIMIT=64] -->
    <!-- Toast when installed Dynamic System is discarded [CHAR LIMIT=64] -->
    <string name="toast_dynsystem_discarded">Discarded dynamic system</string>
    <string name="toast_dynsystem_discarded">Discarded dynamic system</string>
+1 −1
Original line number Original line Diff line number Diff line
@@ -462,7 +462,7 @@ public class DynamicSystemInstallationService extends Service
                        .setStyle(new Notification.BigTextStyle().bigText(msgInUse));
                        .setStyle(new Notification.BigTextStyle().bigText(msgInUse));


                builder.addAction(new Notification.Action.Builder(
                builder.addAction(new Notification.Action.Builder(
                        null, getString(R.string.notification_action_uninstall),
                        null, getString(R.string.notification_action_reboot_to_origin),
                        createPendingIntent(ACTION_REBOOT_TO_NORMAL)).build());
                        createPendingIntent(ACTION_REBOOT_TO_NORMAL)).build());


                break;
                break;