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

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

View File

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