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

Merge "DynamicSystem string review followup" into qt-dev

Browse Source 
am: 1ed8d8109f

Change-Id: I58e694e7a9e6a696d6a9aeb4279a137cc793c489
This commit is contained in:
Po-Chien Hsueh
2019-04-09 03:40:23 -07:00
committed by android-build-merger
parent 1e252837c8 1ed8d8109f
commit ad9b28027b
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/image/DynamicSystemClient.java
View File

@@ -211,7 +211,7 @@ public class DynamicSystemClient {
* Intent Keys * Intent Keys
*/ */
/** /**
* Intent key: Size of system image, in bytes. * Intent key: Size of the system image, in bytes.
* @hide * @hide
*/ */
public static final String KEY_SYSTEM_SIZE = "KEY_SYSTEM_SIZE"; public static final String KEY_SYSTEM_SIZE = "KEY_SYSTEM_SIZE";
@@ -365,7 +365,7 @@ public class DynamicSystemClient {
* *
* This function doesn't require prior calling {@link #bind}. * This function doesn't require prior calling {@link #bind}.
* *
* @param systemUrl A network URL or a file URL to system image. * @param systemUrl a network Uri, a file Uri or a content Uri pointing to a system image file.
* @param systemSize size of system image. * @param systemSize size of system image.
*/ */
@RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM) @RequiresPermission(android.Manifest.permission.INSTALL_DYNAMIC_SYSTEM)
@@ -381,7 +381,7 @@ public class DynamicSystemClient {
* *
* This function doesn't require prior calling {@link #bind}. * This function doesn't require prior calling {@link #bind}.
* *
* @param systemUrl A network URL or a file URL to system image. * @param systemUrl a network Uri, a file Uri or a content Uri pointing to a system image file.
* @param systemSize size of system image. * @param systemSize size of system image.
* @param userdataSize bytes reserved for userdata. * @param userdataSize bytes reserved for userdata.
*/ */

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

@@ -13,11 +13,11 @@
<string name="keyguard_description">Please enter your password and continue to AndroidOnTap installation</string> <string name="keyguard_description">Please enter your password and continue to AndroidOnTap installation</string>
<!-- Displayed on notification: AndroidOnTap installation is completed [CHAR LIMIT=128] --> <!-- Displayed on notification: AndroidOnTap installation is completed [CHAR LIMIT=128] -->
<string name="notification_install_completed">New system is ready, you can reboot into it or discard it.</string> <string name="notification_install_completed">System update is ready. To finish installing, restart your device.</string>
<!-- Displayed on notification: AndroidOnTap installation is in progress [CHAR LIMIT=128] --> <!-- Displayed on notification: AndroidOnTap installation is in progress [CHAR LIMIT=128] -->
<string name="notification_install_inprogress">Installation is in progress.</string> <string name="notification_install_inprogress">Install in progress</string>
<!-- Displayed on notification: AndroidOnTap installation is in progress [CHAR LIMIT=128] --> <!-- Displayed on notification: AndroidOnTap installation is in progress [CHAR LIMIT=128] -->
<string name="notification_install_failed">Installation Failed.</string> <string name="notification_install_failed">Install Failed</string>
<!-- Displayed on notification: We are running in AndroidOnTap [CHAR LIMIT=128] --> <!-- Displayed on notification: We are running in AndroidOnTap [CHAR LIMIT=128] -->
<string name="notification_dynsystem_in_use">We are running in AndroidOnTap.</string> <string name="notification_dynsystem_in_use">We are running in AndroidOnTap.</string>
@@ -27,12 +27,12 @@
<string name="notification_action_discard">Discard</string> <string name="notification_action_discard">Discard</string>
<!-- Action on notification: Uninstall AndroidOnTap [CHAR LIMIT=16] --> <!-- Action on notification: Uninstall AndroidOnTap [CHAR LIMIT=16] -->
<string name="notification_action_uninstall">Uninstall</string> <string name="notification_action_uninstall">Uninstall</string>
<!-- Action on notification: Reboot to AndroidOnTap [CHAR LIMIT=16] --> <!-- Action on notification: Restart to AndroidOnTap [CHAR LIMIT=16] -->
<string name="notification_action_reboot_to_dynsystem">Reboot</string> <string name="notification_action_reboot_to_dynsystem">Restart</string>
<!-- Toast when installed AndroidOnTap is discarded [CHAR LIMIT=64] --> <!-- Toast when installed AndroidOnTap is discarded [CHAR LIMIT=64] -->
<string name="toast_dynsystem_discarded">Installed AndroidOnTap is discarded.</string> <string name="toast_dynsystem_discarded">Installed AndroidOnTap is discarded.</string>
<!-- Toast when we fail to launch into AndroidOnTap [CHAR LIMIT=64] --> <!-- Toast when we fail to launch into AndroidOnTap [CHAR LIMIT=64] -->
<string name="toast_failed_to_reboot_to_dynsystem">Failed to reboot into AndroidOnTap.</string> <string name="toast_failed_to_reboot_to_dynsystem">Failed to restart to AndroidOnTap.</string>
</resources> </resources>

8
packages/DynamicSystemInstallationService/src/com/android/dynandroid/DynamicSystemInstallationService.java
View File

@@ -379,14 +379,14 @@ public class DynamicSystemInstallationService extends Service
case STATUS_READY: case STATUS_READY:
builder.setContentText(getString(R.string.notification_install_completed)); builder.setContentText(getString(R.string.notification_install_completed));
builder.addAction(new Notification.Action.Builder(
null, getString(R.string.notification_action_reboot_to_dynsystem),
createPendingIntent(ACTION_REBOOT_TO_DYN_SYSTEM)).build());
builder.addAction(new Notification.Action.Builder( builder.addAction(new Notification.Action.Builder(
null, getString(R.string.notification_action_discard), null, getString(R.string.notification_action_discard),
createPendingIntent(ACTION_DISCARD_INSTALL)).build()); createPendingIntent(ACTION_DISCARD_INSTALL)).build());
builder.addAction(new Notification.Action.Builder(
null, getString(R.string.notification_action_reboot_to_dynsystem),
createPendingIntent(ACTION_REBOOT_TO_DYN_SYSTEM)).build());
break; break;
case STATUS_IN_USE: case STATUS_IN_USE: