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

Commit 48b26268 authored by Clara Bayarri's avatar Clara Bayarri Committed by android-build-merger
Browse files

Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it"... 

Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev am: 88545ce4
am: 7d47bd49

* commit '7d47bd49':
  Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it

Change-Id: Ie7197b6bbd2234e329d5e960180136e30eebbc07
parents 88b1768c 7d47bd49

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class SettingsDrawerActivity extends Activity { 
    protected static final boolean DEBUG_TIMING = false;

    private static final String TAG = "SettingsDrawerActivity";



    static final String EXTRA_SHOW_MENU = "show_drawer_menu";

    public static final String EXTRA_SHOW_MENU = "show_drawer_menu";



    private static List<DashboardCategory> sDashboardCategories;

    private static HashMap<Pair<String, String>, Tile> sTileCache;