Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511

Browse Source 
am: 3d2cba5

* commit '3d2cba56632ad05427dc058b8097c18ed954296e':
  Fix back button on fragments without help uris

Change-Id: I0141b385ff13002c9975b6d050753cec0ca87ff5
This commit is contained in:
Udam Saini
2016-04-19 20:54:14 +00:00
committed by android-build-merger
parent 63e39411ea 3d2cba5663
commit a1acb6a9f8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -187,10 +187,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
if (!TextUtils.isEmpty(mHelpUri)) {
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
}
@Override @Override
public void onResume() { public void onResume() {