PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevents drawer menu from showing depending on intent." into nyc-dev am: 11cd08a

Browse Source 
am: 73ce947

* commit '73ce9476827ed661536c10831039eebb9ce7eb40':
  Prevents drawer menu from showing depending on intent.

Change-Id: I4521de520df06f544200bd39b63608e8d376929f
This commit is contained in:
Udam Saini
2016-03-29 17:01:20 +00:00
committed by android-build-merger
parent 77045c3317 73ce947682
commit fd1ae344be
5 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SettingsActivity.java
View File

@@ -200,6 +200,8 @@ public class SettingsActivity extends SettingsDrawerActivity
public static final String EXTRA_SHOW_FRAGMENT_AS_SUBSETTING =
":settings:show_fragment_as_subsetting";
public static final String EXTRA_HIDE_DRAWER = ":settings:hide_drawer";
public static final String META_DATA_KEY_FRAGMENT_CLASS =
"com.android.settings.FRAGMENT_CLASS";
@@ -512,6 +514,9 @@ public class SettingsActivity extends SettingsDrawerActivity
if (intent.hasExtra(EXTRA_UI_OPTIONS)) {
getWindow().setUiOptions(intent.getIntExtra(EXTRA_UI_OPTIONS, 0));
}
if (intent.getBooleanExtra(EXTRA_HIDE_DRAWER, false)) {
setIsDrawerPresent(false);
}
mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
Context.MODE_PRIVATE);