diff options
| author | Po-Chien Hsueh <pchsueh@google.com> | 2020-02-20 14:19:39 +0800 |
|---|---|---|
| committer | Po-Chien Hsueh <pchsueh@google.com> | 2020-02-20 14:19:39 +0800 |
| commit | 5b380af950681b766a6f4363b1407419c3258bf1 (patch) | |
| tree | 2f9fb4d3e16057865450504b111a868b44503438 /packages/DynamicSystemInstallationService | |
| parent | a975b9a901f69843758d403aa804d2c014b3067c (diff) | |
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
Diffstat (limited to 'packages/DynamicSystemInstallationService')
| -rw-r--r-- | packages/DynamicSystemInstallationService/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/DynamicSystemInstallationService/res/values/strings.xml b/packages/DynamicSystemInstallationService/res/values/strings.xml index 25b7fc1b5ce2..e124be605cc7 100644 --- a/packages/DynamicSystemInstallationService/res/values/strings.xml +++ b/packages/DynamicSystemInstallationService/res/values/strings.xml @@ -27,10 +27,11 @@ <string name="notification_action_cancel">Cancel</string> <!-- Action on notification: Discard installation [CHAR LIMIT=16] --> <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] --> <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] --> <string name="toast_dynsystem_discarded">Discarded dynamic system</string> diff --git a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java index 7affe8888628..37a77be52983 100644 --- a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java +++ b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java @@ -462,7 +462,7 @@ public class DynamicSystemInstallationService extends Service .setStyle(new Notification.BigTextStyle().bigText(msgInUse)); 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()); break; |