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

Browse Source 
am: ed74511

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

Change-Id: I327abac867272c5900603d71d6e7ed4370dc0c48
This commit is contained in:
Johan Redestig
2016-04-19 20:50:48 +00:00
committed by android-build-merger
parent c8387072ee ed74511cb1
commit 2620e248f3
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