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

2016-04-19 21:02:56 +00:00
parent c1dcea2600 ed88b97855
commit 56bc22b88a
1 changed files with 1 additions and 3 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -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