From 361808fb366671a1af562e7633da68a08739ac7e Mon Sep 17 00:00:00 2001
From: Edward Cunningham <ejc@google.com>
Date: Wed, 31 Mar 2021 20:57:54 +0000
Subject: [PATCH] Update some Package Installer strings.

Bug: 183699047
Test: manual
Change-Id: I632bcaf2b448d3c697be0fe060df7cc5b67da94e
---
 .../res/layout/install_content_view.xml        |  8 --------
 .../PackageInstaller/res/values/strings.xml    | 18 +++++++-----------
 .../PackageInstallerActivity.java              |  5 ++---
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/packages/PackageInstaller/res/layout/install_content_view.xml b/packages/PackageInstaller/res/layout/install_content_view.xml
index 5e94a29a63991..bd08483e3619b 100644
--- a/packages/PackageInstaller/res/layout/install_content_view.xml
+++ b/packages/PackageInstaller/res/layout/install_content_view.xml
@@ -85,14 +85,6 @@
         android:text="@string/install_confirm_question_update"
         android:visibility="invisible" />
 
-    <TextView
-        android:id="@+id/install_confirm_question_update_system"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@android:style/TextAppearance.Material.Subhead"
-        android:text="@string/install_confirm_question_update_system"
-        android:visibility="invisible" />
-
     <TextView
         android:id="@+id/install_success"
         android:layout_width="wrap_content"
diff --git a/packages/PackageInstaller/res/values/strings.xml b/packages/PackageInstaller/res/values/strings.xml
index 3e4270621554c..ca3ec3cf5b8ba 100644
--- a/packages/PackageInstaller/res/values/strings.xml
+++ b/packages/PackageInstaller/res/values/strings.xml
@@ -21,6 +21,8 @@
     <!-- [CHAR LIMIT=15] -->
     <string name="install">Install</string>
     <!-- [CHAR LIMIT=15] -->
+    <string name="update">Update</string>
+    <!-- [CHAR LIMIT=15] -->
     <string name="done">Done</string>
     <!-- [CHAR LIMIT=15] -->
     <string name="cancel">Cancel</string>
@@ -32,15 +34,9 @@
     <string name="install_done">App installed.</string>
     <!-- Message for installing a new app that requires some permissions [CHAR LIMIT=NONE] -->
     <!-- Message for installing a new app that does not require permissions [CHAR LIMIT=NONE] -->
-    <string name="install_confirm_question">Do you want to install this application?</string>
+    <string name="install_confirm_question">Do you want to install this app?</string>
     <!-- Message for updating an existing app [CHAR LIMIT=NONE] -->
-    <string name="install_confirm_question_update">Do you want to install an update
-            to this existing application?  Your existing data will not
-            be lost.</string>
-    <!-- Message for updating an existing system app [CHAR LIMIT=NONE] -->
-    <string name="install_confirm_question_update_system">Do you want to install an update
-            to this built-in application?  Your existing data will not
-            be lost.</string>
+    <string name="install_confirm_question_update">Do you want to update this app?</string>
     <!-- [CHAR LIMIT=100] -->
     <string name="install_failed">App not installed.</string>
     <!-- Reason displayed when installation fails because the package was blocked
@@ -186,13 +182,13 @@
     <string name="app_name_unknown">Unknown</string>
 
     <!-- Text to show in warning dialog on the tablet when the app source is not trusted [CHAR LIMIT=NONE] -->
-    <string name="untrusted_external_source_warning" product="tablet">For your security, your tablet is not allowed to install unknown apps from this source.</string>
+    <string name="untrusted_external_source_warning" product="tablet">For your security, your tablet currently isn’t allowed to install unknown apps from this source. You can change this in Settings.</string>
 
     <!-- Text to show in warning dialog on the tv when the app source is not trusted [CHAR LIMIT=NONE] -->
-    <string name="untrusted_external_source_warning" product="tv">For your security, your TV is not allowed to install unknown apps from this source.</string>
+    <string name="untrusted_external_source_warning" product="tv">For your security, your TV currently isn’t allowed to install unknown apps from this source. You can change this in Settings.</string>
 
     <!-- Text to show in warning dialog on the phone when the app source is not trusted [CHAR LIMIT=NONE] -->
-    <string name="untrusted_external_source_warning" product="default">For your security, your phone is not allowed to install unknown apps from this source.</string>
+    <string name="untrusted_external_source_warning" product="default">For your security, your phone currently isn’t allowed to install unknown apps from this source. You can change this in Settings.</string>
 
     <!-- Text to show in warning dialog on the phone when the app source cannot be identified [CHAR LIMIT=NONE] -->
     <string name="anonymous_source_warning" product="default">
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
index b0c316908a10e..4578597a5a9d9 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -123,9 +123,8 @@ public class PackageInstallerActivity extends AlertActivity {
         View viewToEnable;
 
         if (mAppInfo != null) {
-            viewToEnable = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
-                    ? requireViewById(R.id.install_confirm_question_update_system)
-                    : requireViewById(R.id.install_confirm_question_update);
+            viewToEnable = requireViewById(R.id.install_confirm_question_update);
+            mOk.setText(R.string.update);
         } else {
             // This is a new application with no permissions.
             viewToEnable = requireViewById(R.id.install_confirm_question);