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

Commit 6e801665 authored by Himanshu Gupta's avatar Himanshu Gupta
Browse files

Adding custom text for Private Space app uninstall 

Bug: 304757682
Test: Manual build and flash
Change-Id: Id9c99f34abb9f0617a3ef5678ab352d43d091c73
parent 57a83348

packages/PackageInstaller/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ android_app { 
        "androidx.lifecycle_lifecycle-livedata",

        "androidx.lifecycle_lifecycle-extensions",

        "android.content.pm.flags-aconfig-java",

        "android.os.flags-aconfig-java",

    ],



    lint: {
@@ -77,6 +78,7 @@ android_app { 
        "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 @@ android_app { 
        "androidx.lifecycle_lifecycle-livedata",

        "androidx.lifecycle_lifecycle-extensions",

        "android.content.pm.flags-aconfig-java",

        "android.os.flags-aconfig-java",

    ],

    aaptflags: ["--product tv"],

packages/PackageInstaller/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.ApplicationInfo; 
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 @@ public class UninstallAlertDialogFragment extends DialogFragment implements 
                    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));