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

Commit db053d19 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Checkbox for removing contributes files""

parents 04ab69cb 95358d8b

data/etc/privapp-permissions-platform.xml

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

        <permission name="android.permission.CLEAR_APP_USER_DATA"/>

        <permission name="android.permission.PACKAGE_USAGE_STATS"/>

    </privapp-permissions>

packages/PackageInstaller/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />

    <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />

    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />



    <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" />

packages/PackageInstaller/res/layout/uninstall_content_view.xml

+0 −10
Original line number Diff line number Diff line
@@ -35,16 +35,6 @@ 
        android:layout_height="wrap_content"

        style="@android:style/TextAppearance.Material.Subhead" />



    <CheckBox

        android:id="@+id/clearContributedFiles"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="8dp"

        android:layout_marginStart="-8dp"

        android:paddingLeft="8sp"

        android:visibility="gone"

        style="@android:style/TextAppearance.Material.Subhead" />



    <CheckBox

        android:id="@+id/keepData"

        android:layout_width="wrap_content"

packages/PackageInstaller/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -119,8 +119,6 @@ 
    <string name="uninstall_update_text">Replace this app with the factory version? All data will be removed.</string>

    <!--  [CHAR LIMIT=none] -->

    <string name="uninstall_update_text_multiuser">Replace this app with the factory version? All data will be removed. This affects all users of this device, including those with work profiles.</string>

    <!-- Label of a checkbox that allows to remove the files contributed by app during uninstall [CHAR LIMIT=none] -->

    <string name="uninstall_remove_contributed_files">Also remove <xliff:g id="size" example="1.5MB">%1$s</xliff:g> of associated media files.</string>

    <!-- Label of a checkbox that allows to keep the data (e.g. files, settings) of the app on uninstall [CHAR LIMIT=none] -->

    <string name="uninstall_keep_data">Keep <xliff:g id="size" example="1.5MB">%1$s</xliff:g> of app data.</string>

packages/PackageInstaller/src/com/android/packageinstaller/UninstallUninstalling.java

+0 −5
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ public class UninstallUninstalling extends Activity implements 
            "com.android.packageinstaller.ACTION_UNINSTALL_COMMIT";



    static final String EXTRA_APP_LABEL = "com.android.packageinstaller.extra.APP_LABEL";

    static final String EXTRA_CLEAR_CONTRIBUTED_FILES =

            "com.android.packageinstaller.extra.CLEAR_CONTRIBUTED_FILES";

    static final String EXTRA_KEEP_DATA = "com.android.packageinstaller.extra.KEEP_DATA";



    private int mUninstallId;
@@ -75,8 +73,6 @@ public class UninstallUninstalling extends Activity implements 
            if (savedInstanceState == null) {

                boolean allUsers = getIntent().getBooleanExtra(Intent.EXTRA_UNINSTALL_ALL_USERS,

                        false);

                boolean clearContributedFiles = getIntent().getBooleanExtra(

                        EXTRA_CLEAR_CONTRIBUTED_FILES, false);

                boolean keepData = getIntent().getBooleanExtra(EXTRA_KEEP_DATA, false);

                UserHandle user = getIntent().getParcelableExtra(Intent.EXTRA_USER);
@@ -102,7 +98,6 @@ public class UninstallUninstalling extends Activity implements 
                        broadcastIntent, PendingIntent.FLAG_UPDATE_CURRENT);



                int flags = allUsers ? PackageManager.DELETE_ALL_USERS : 0;

                flags |= clearContributedFiles ? PackageManager.DELETE_CONTRIBUTED_MEDIA : 0;

                flags |= keepData ? PackageManager.DELETE_KEEP_DATA : 0;



                try {