commit 76218e54ae58dd81c3ad14f925129b80be8073c5
author Johan Redestig <johan.redestig@sonymobile.com> Tue Apr 19 08:29:30 2016 +0200
committer Udam Saini <udam@google.com> Tue Apr 19 10:26:04 2016 -0700
tree d8701104cd6e6193948d89b55d4b4104b5e7bcd7
parent c3ab03ecdb505114770cbb87b61457fabf75847f

Fix back button on fragments without help uris

This is a follow up to 0708d9e119. The setHasOptionsMenu has
to be set for the back button to work and this needs to happen
regardles if the fragment has an help uri or not.

Bug: 28237921
Change-Id: Icec7a94312bdab5470efa0893a339d753c995eb1

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