diff options
| author | 2016-10-24 18:43:10 +0000 | |
|---|---|---|
| committer | 2016-10-24 18:43:10 +0000 | |
| commit | 80ac3f0a4b9d007afcf51883aa8781a1ba2dd0d2 (patch) | |
| tree | 3e1cfaecdd95e0580b77b65b7d6251635ab67272 | |
| parent | 5be5a41170aadc955fa03537f52235922f837be2 (diff) | |
| parent | 0be36ac0d14c0f69b6f9b256f73d6ff94b83d397 (diff) | |
Merge "Allow operator/manufacturer setting to use priority" am: aef1a557aa am: 4244d53c3e
am: 0be36ac0d1
Change-Id: I24b4d5ef74540cba4c90a134615eadd82b1c4a62
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java index e70cc29a7744..4f986e1ce227 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java @@ -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, |