Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef9427c7 authored by Anushree Ganjam's avatar Anushree Ganjam Committed by Android (Google) Code Review
Browse files

Merge "Add "Uninstall app" string for private space shortcut." into main

parents ddeca974 87e875e7

quickstep/tests/src/com/android/quickstep/TaplPrivateSpaceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ 
    <string name="app_info_drop_target_label">App info</string>

    <!-- Label for install to private profile shortcut label. [CHAR_LIMIT=20] -->

    <string name="install_private_system_shortcut_label">Install in private</string>

    <!-- Label for uninstall app private profile shortcut.-->

    <string name="uninstall_private_system_shortcut_label">Uninstall app</string>

    <!-- Label for install drop target. [CHAR_LIMIT=20] -->

    <string name="install_drop_target_label">Install</string>

    <!-- Label for dismiss prediction. -->

src/com/android/launcher3/popup/SystemShortcut.java

+2 −1
Original line number Diff line number Diff line
@@ -360,7 +360,8 @@ public abstract class SystemShortcut<T extends ActivityContext> 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;