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

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

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