Adding custom text for Private Space app uninstall
Bug: 304757682
Test: Manual build and flash
Change-Id: Id9c99f34abb9f0617a3ef5678ab352d43d091c73
diff --git a/packages/PackageInstaller/Android.bp b/packages/PackageInstaller/Android.bp
index 6213b34..25ad9b8 100644
--- a/packages/PackageInstaller/Android.bp
+++ b/packages/PackageInstaller/Android.bp
@@ -50,6 +50,7 @@
"androidx.lifecycle_lifecycle-livedata",
"androidx.lifecycle_lifecycle-extensions",
"android.content.pm.flags-aconfig-java",
+ "android.os.flags-aconfig-java",
],
lint: {
@@ -77,6 +78,7 @@
"androidx.lifecycle_lifecycle-livedata",
"androidx.lifecycle_lifecycle-extensions",
"android.content.pm.flags-aconfig-java",
+ "android.os.flags-aconfig-java",
],
aaptflags: ["--product tablet"],
@@ -106,6 +108,7 @@
"androidx.lifecycle_lifecycle-livedata",
"androidx.lifecycle_lifecycle-extensions",
"android.content.pm.flags-aconfig-java",
+ "android.os.flags-aconfig-java",
],
aaptflags: ["--product tv"],
diff --git a/packages/PackageInstaller/res/values/strings.xml b/packages/PackageInstaller/res/values/strings.xml
index 0a2e880..c9050c7 100644
--- a/packages/PackageInstaller/res/values/strings.xml
+++ b/packages/PackageInstaller/res/values/strings.xml
@@ -131,6 +131,8 @@
<string name="uninstall_application_text_current_user_clone_profile">Do you want to delete this app?</string>
<!-- [CHAR LIMIT=none] -->
<string name="uninstall_application_text_with_clone_instance">Do you want to uninstall this app? <xliff:g id="package_label">%1$s</xliff:g> clone will also be deleted.</string>
+ <!-- [CHAR LIMIT=none] -->
+ <string name="uninstall_application_text_current_user_private_profile">Do you want to uninstall this app from your private space?</string>
<!-- Label for the notification channel containing notifications for current uninstall operations [CHAR LIMIT=40] -->
<string name="uninstalling_notification_channel">Running uninstalls</string>
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java
index d113878..e889050 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java
@@ -30,6 +30,7 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.os.Flags;
import android.os.Process;
import android.os.UserHandle;
import android.os.UserManager;
@@ -157,6 +158,12 @@
mIsClonedApp = true;
messageBuilder.append(getString(
R.string.uninstall_application_text_current_user_clone_profile));
+ } else if (Flags.allowPrivateProfile()
+ && customUserManager.isPrivateProfile()
+ && customUserManager.isSameProfileGroup(dialogInfo.user, myUserHandle)) {
+ messageBuilder.append(getString(
+ R.string.uninstall_application_text_current_user_private_profile,
+ userName));
} else {
messageBuilder.append(
getString(R.string.uninstall_application_text_user, userName));