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

Commit ff6def3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Align Settings and SystemUI packageName references" am: 1452f7dd 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819



Change-Id: If249a6b219c344edbddade320f06c9f512bffd18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae70edc7 1452f7dd

src/com/android/settings/Utils.java

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ public final class Utils extends com.android.settingslib.Utils { 


    public static final String SETTINGS_PACKAGE_NAME = "com.android.settings";



    public static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";



    public static final String OS_PKG = "os";



    /**

src/com/android/settings/applications/AppStateOverlayBridge.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.Manifest; 
import android.app.AppOpsManager;

import android.content.Context;



import com.android.settings.Utils;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.applications.ApplicationsState.AppEntry;

import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -70,7 +71,7 @@ public class AppStateOverlayBridge extends AppStateAppOpsBridge { 
        private static final List<String> DISABLE_PACKAGE_LIST = new ArrayList<>();



        static {

            DISABLE_PACKAGE_LIST.add("com.android.systemui");

            DISABLE_PACKAGE_LIST.add(Utils.SYSTEMUI_PACKAGE_NAME);

        }



        public OverlayState(PermissionState permissionState) {

src/com/android/settings/applications/RecentAppStatsMixin.java

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.applications;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;

import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME;



import android.app.Application;

import android.app.usage.UsageStats;
@@ -71,7 +72,7 @@ public class RecentAppStatsMixin implements Comparator<UsageStats>, LifecycleObs 
                "android",

                "com.android.phone",

                SETTINGS_PACKAGE_NAME,

                "com.android.systemui",

                SYSTEMUI_PACKAGE_NAME,

                "com.android.providers.calendar",

                "com.android.providers.media"

        ));

src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import androidx.preference.Preference.OnPreferenceClickListener; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.applications.AppInfoBase;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.EmptyTextSettings;
@@ -57,7 +58,7 @@ public class PictureInPictureSettings extends EmptyTextSettings { 
    static final List<String> IGNORE_PACKAGE_LIST = new ArrayList<>();



    static {

        IGNORE_PACKAGE_LIST.add("com.android.systemui");

        IGNORE_PACKAGE_LIST.add(Utils.SYSTEMUI_PACKAGE_NAME);

    }



    /**

src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.preference.Preference.OnPreferenceClickListener; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.applications.AppInfoBase;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.EmptyTextSettings;
@@ -58,7 +59,7 @@ public class TurnScreenOnSettings extends EmptyTextSettings { 
    static final List<String> IGNORE_PACKAGE_LIST = new ArrayList<>();



    static {

        IGNORE_PACKAGE_LIST.add("com.android.systemui");

        IGNORE_PACKAGE_LIST.add(Utils.SYSTEMUI_PACKAGE_NAME);

    }



    /**