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

Commit 81769558 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:... 

Merge "Allow operator/manufacturer setting to use priority" am: aef1a557 am: 4244d53c am: 0be36ac0
am: 80ac3f0a

Change-Id: I5bc6a440d7a906caed9cdfe63464f692e7f0ecef
parents 382d6ecc 80ac3f0a

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

+11 −3
Original line number Diff line number Diff line
@@ -142,9 +142,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);
@@ -211,12 +211,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,