PawletOS/app_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 am: 3d2cba5

Browse Source 
am: a1acb6a

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

Change-Id: I953a114db8d8600d5f8883428d5ded1f3f501250
This commit is contained in:
Johan Redestig
2016-04-19 21:02:49 +00:00
committed by android-build-merger
parent 1ec9b27adc a1acb6a9f8
commit ed88b97855
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,9 +187,7 @@ 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