From 4adbbfc6d1413440a4b7272b12236421056bf043 Mon Sep 17 00:00:00 2001 From: Yoshinori Hirano Date: Mon, 6 Jun 2016 15:47:47 +0900 Subject: Allow operator/manufacturer setting to use priority This allows apps which use OPERATOR_SETTING or MANUFACTURER_SETTING intent to use priority. The apps can put their setting in any position in the dashboard of Settings app. Bug: 29143388 Test: manual - installed SettingsTests.apk using priority into priv-app and opened Settings app Change-Id: Ie5df36e8f3ed704583b1559c16ee3719c7545271 --- .../src/com/android/settingslib/drawer/TileUtils.java | 14 +++++++++++--- 1 file 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 418b138c3b0a..994f038c9418 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java @@ -123,9 +123,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); } getTilesForAction(context, user, EXTRA_SETTINGS_ACTION, cache, null, tiles, false); } @@ -177,12 +177,20 @@ public class TileUtils { private static void getTilesForAction(Context context, UserHandle user, String action, Map, Tile> addedCache, String defaultCategory, ArrayList outTiles, boolean requireSettings) { + getTilesForAction(context, user, action, addedCache, defaultCategory, outTiles, + requireSettings, requireSettings); + } + + private static void getTilesForAction(Context context, + UserHandle user, String action, Map, Tile> addedCache, + String defaultCategory, ArrayList 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, -- cgit v1.2.3-59-g8ed1b