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

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

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