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

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

Merge "Leverage the code from qt-qpr1-dev to master"

parents 4620cddb 8d0d9009

res/values/config.xml

+4 −2
Original line number Diff line number Diff line
@@ -416,9 +416,11 @@ 
    <string-array name="config_suppress_injected_tile_keys" translatable="false"/>



    <!-- Reset application package name -->

    <string-array name="config_reset_app_package_name" translatable="false">

        <item>com.android.systemui</item>

    <string-array name="config_skip_reset_apps_package_name" translatable="false">

        <item>android</item>

        <item>com.android.providers.downloads</item>

        <item>com.android.systemui</item>

        <item>com.android.vending</item>

    </string-array>



    <!-- Settings panel keeps observe this uri -->

src/com/android/settings/applications/manageapplications/ResetAppsHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener, 
                        PackageManager.GET_DISABLED_COMPONENTS);

                final List<String> whiteList = Arrays.asList(

                        mContext.getResources().getStringArray(

                                R.array.config_reset_app_package_name));

                                R.array.config_skip_reset_apps_package_name));



                for (int i = 0; i < apps.size(); i++) {

                    ApplicationInfo app = apps.get(i);