Merge "Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev am: 2cbf71a0be" into nyc-mr1-dev-plus-aosp

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

@@ -277,6 +277,13 @@ public class SettingsDrawerActivity extends Activity {
         }
     }
 
+    public HashMap<Pair<String, String>, Tile> getTileCache() {
+        if (sTileCache == null) {
+            getDashboardCategories();
+        }
+        return sTileCache;
+    }
+
     public void onProfileTileOpen() {
         finish();
     }

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

@@ -302,7 +302,7 @@ public class TileUtils {
         return false;
     }
 
-    private static final Comparator<Tile> TILE_COMPARATOR =
+    public static final Comparator<Tile> TILE_COMPARATOR =
             new Comparator<Tile>() {
         @Override
         public int compare(Tile lhs, Tile rhs) {