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

This commit is contained in:
Udam Saini
2016-04-19 20:39:29 +00:00
committed by Android (Google) Code Review

View File

@@ -187,10 +187,8 @@ 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
public void onResume() { public void onResume() {