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

Commit 80ac3f0a authored by Yoshinori Hirano's avatar Yoshinori Hirano Committed by android-build-merger
Browse files

Merge "Allow operator/manufacturer setting to use priority" am: aef1a557 am: 4244d53c 

am: 0be36ac0

Change-Id: I24b4d5ef74540cba4c90a134615eadd82b1c4a62
parents 5be5a411 0be36ac0

packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java

+11 −3
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ public class TileUtils { 
                // Only add Settings for this user.

                getTilesForAction(context, user, SETTINGS_ACTION, cache, null, tiles, true);

                getTilesForAction(context, user, OPERATOR_SETTINGS, cache,

                        OPERATOR_DEFAULT_CATEGORY, tiles, false);

                        OPERATOR_DEFAULT_CATEGORY, tiles, false, true);

                getTilesForAction(context, user, MANUFACTURER_SETTINGS, cache,

                        MANUFACTURER_DEFAULT_CATEGORY, tiles, false);

                        MANUFACTURER_DEFAULT_CATEGORY, tiles, false, true);

            }

            if (setup) {

                getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false);
@@ -182,12 +182,20 @@ public class TileUtils { 
    private static void getTilesForAction(Context context,

            UserHandle user, String action, Map<Pair<String, String>, Tile> addedCache,

            String defaultCategory, ArrayList<Tile> outTiles, boolean requireSettings) {

        getTilesForAction(context, user, action, addedCache, defaultCategory, outTiles,

                requireSettings, requireSettings);

    }



    private static void getTilesForAction(Context context,

            UserHandle user, String action, Map<Pair<String, String>, Tile> addedCache,

            String defaultCategory, ArrayList<Tile> outTiles, boolean requireSettings,

            boolean usePriority) {

        Intent intent = new Intent(action);

        if (requireSettings) {

            intent.setPackage(SETTING_PKG);

        }

        getTilesForIntent(context, user, intent, addedCache, defaultCategory, outTiles,

                requireSettings, true);

                usePriority, true);

    }



    public static void getTilesForIntent(Context context, UserHandle user, Intent intent,