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

Merge "Replace action button "Uninstall" with "Restart"" am: cedf22960e

Browse Source 
Change-Id: I24bc2dd13967c611c34e8d2b287ba991f8c838d4
This commit is contained in:
Automerger Merge Worker
2020-02-20 08:28:33 +00:00
parent 8b18b53599 cedf22960e
commit bcafeae6de
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/DynamicSystemInstallationService/res/values/strings.xml
View File

@@ -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>

2
packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
View File

@@ -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;