From 87e875e702d8d2ad7d7a70d16f7e540c1c518526 Mon Sep 17 00:00:00 2001 From: Anushree Ganjam Date: Tue, 21 May 2024 14:51:35 -0700 Subject: [PATCH] Add "Uninstall app" string for private space shortcut. Before: https://screenshot.googleplex.com/8RvbiWnJmgAvSYf.png After: https://screenshot.googleplex.com/4e7N3rr8EAH7k6B.png Bug: 335451332 Flag: com.android.launcher3.enable_private_space Flag: EXEMPT resource only update Test: Manual Change-Id: I759005f51562683cb6c095abcca27d448acd10f8 --- .../tests/src/com/android/quickstep/TaplPrivateSpaceTest.java | 2 +- res/values/strings.xml | 2 ++ src/com/android/launcher3/popup/SystemShortcut.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java b/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java index 69a7664e48..82905085fe 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java +++ b/quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java @@ -158,7 +158,7 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest { try { // Get the "uninstall" menu item. - homeAllApps.getAppIcon(INSTALLED_APP_NAME).openMenu().getMenuItem("Uninstall"); + homeAllApps.getAppIcon(INSTALLED_APP_NAME).openMenu().getMenuItem("Uninstall app"); } finally { // UnFreeze homeAllApps.unfreeze(); diff --git a/res/values/strings.xml b/res/values/strings.xml index f114b1eb15..74a6f33d57 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -198,6 +198,8 @@ App info Install in private + + Uninstall app Install diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java index 6005573e77..83e9810060 100644 --- a/src/com/android/launcher3/popup/SystemShortcut.java +++ b/src/com/android/launcher3/popup/SystemShortcut.java @@ -360,7 +360,8 @@ public abstract class SystemShortcut extends ItemInfo UninstallApp(T target, ItemInfo itemInfo, @NonNull View originalView, @NonNull ComponentName cn) { - super(R.drawable.ic_uninstall_no_shadow, R.string.uninstall_drop_target_label, target, + super(R.drawable.ic_uninstall_no_shadow, + R.string.uninstall_private_system_shortcut_label, target, itemInfo, originalView); mComponentName = cn;