commit ed74511cb170f499e3c776208471b9ff3fbc762b
author Udam Saini <udam@google.com> Tue Apr 19 20:39:29 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 20:39:29 2016 +0000
tree cc0753c29691ca9fa1ed20f87e71116daa226f2a
parent 40c228d989c19eb69f5efe258cf7d24cf86e93ba
parent 76218e54ae58dd81c3ad14f925129b80be8073c5

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

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index e0a2844..1a3c850 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -187,9 +187,7 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        if (!TextUtils.isEmpty(mHelpUri)) {
-            setHasOptionsMenu(true);
-        }
+        setHasOptionsMenu(true);
     }
 
     @Override