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

Commit 63f0f5b3 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev 

am: 2cbf71a0

* commit '2cbf71a0':
  Add Shortcut API to Settings (1/2) b/28298258

Change-Id: I5ab2afdabae51375c01412855913c4e9c538b4b9
parents be197a50 2cbf71a0

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

+7 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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) {