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

Commit ebb945d4 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "No activity while uninstalling unless needed"

parents ac6e46ee de66f874

AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -95,6 +95,9 @@ 
            </intent-filter>

            </intent-filter>

        </activity>

        </activity>





        <receiver android:name=".UninstallFinish"

                android:exported="false" />



        <activity android:name=".UninstallAppProgress"

        <activity android:name=".UninstallAppProgress"

                android:configChanges="mnc|mnc|touchscreen|navigation|screenLayout|screenSize|smallestScreenSize|orientation|locale|keyboard|keyboardHidden|fontScale|uiMode|layoutDirection|density"

                android:configChanges="mnc|mnc|touchscreen|navigation|screenLayout|screenSize|smallestScreenSize|orientation|locale|keyboard|keyboardHidden|fontScale|uiMode|layoutDirection|density"

                android:exported="false" />

                android:exported="false" />

res/drawable/ic_error.xml

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2016 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

   you may not use this file except in compliance with the License.

   You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



   Unless required by applicable law or agreed to in writing, software

   distributed under the License is distributed on an "AS IS" BASIS,

   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

   See the License for the specific language governing permissions and

   limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

            android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"

            android:fillColor="#000000"/>

</vector>

res/drawable/ic_remove.xml

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2016 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

   you may not use this file except in compliance with the License.

   You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



   Unless required by applicable law or agreed to in writing, software

   distributed under the License is distributed on an "AS IS" BASIS,

   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

   See the License for the specific language governing permissions and

   limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

            android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z"

            android:fillColor="#000000"/>

</vector>

res/drawable/ic_settings_multiuser.xml

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorAccent">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12.0,12.0c2.21,0.0 4.0,-1.79 4.0,-4.0s-1.79,-4.0 -4.0,-4.0 -4.0,1.79 -4.0,4.0 1.79,4.0 4.0,4.0zm0.0,2.0c-2.67,0.0 -8.0,1.34 -8.0,4.0l0.0,2.0l16.0,0.0l0.0,-2.0c0.0,-2.66 -5.33,-4.0 -8.0,-4.0z"/>

</vector>

res/values/strings.xml

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

    <string name="uninstall_update_text">Replace this app with the factory version? All data will be removed.</string>

    <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>

    <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>

    <string name="uninstalling">Uninstalling\u2026</string>

    <string name="uninstalling">Uninstalling\u2026</string>

    <string name="uninstalling_app">Uninstalling <xliff:g id="package_label">%1$s</xliff:g>\u2026</string>

    <string name="uninstall_done">Uninstall finished.</string>

    <string name="uninstall_done">Uninstall finished.</string>

    <string name="uninstall_done_app">Uninstalled <xliff:g id="package_label">%1$s</xliff:g>.</string>

    <string name="uninstall_failed">Uninstall unsuccessful.</string>

    <string name="uninstall_failed">Uninstall unsuccessful.</string>

    <string name="uninstall_failed_app">Uninstalling <xliff:g id="package_label">%1$s</xliff:g> unsuccessful.</string>

    <!-- String presented to the user when uninstalling a package failed because the target package

    <!-- String presented to the user when uninstalling a package failed because the target package

        is a current device administrator [CHAR LIMIT=80] -->

        is a current device administrator [CHAR LIMIT=80] -->

    <string name="uninstall_failed_device_policy_manager">Can\'t uninstall because this package is an

    <string name="uninstall_failed_device_policy_manager">Can\'t uninstall because this package is an