commit 59608b7644bcc655dffc9edea48398f6a07c6a1d
author Pankaj Garg <pgarg@codeaurora.org> Mon Dec 15 11:22:23 2014 -0800
committer WebTech Code Review <code-review@localhost> Mon Dec 15 14:44:07 2014 -0800
tree d31dd0defbe8d5be9650b57356e5f60d0b569a2d
parent 1b163273ba00a4d591bb2c39031b289c721f6b65

Fixed problem with browser menu back navigation

The user was not able to use the top button in browser's
settings and about menu to navigate back to main browser
screen. This is due to incompatibility of Fragment APIs.
Added explicit code in preference activity to navigate back.

Change-Id: Ie6616a0b9a492ab07b650f0cdcd28682855e42d9

src/com/android/browser/AutoFillSettingsFragment.java

diff --git a/src/com/android/browser/AutoFillSettingsFragment.java b/src/com/android/browser/AutoFillSettingsFragment.java
index d0ca946..6bde1a2 100644
--- a/src/com/android/browser/AutoFillSettingsFragment.java
+++ b/src/com/android/browser/AutoFillSettingsFragment.java
@@ -131,6 +131,7 @@
         if (bar != null) {
             bar.setTitle(R.string.pref_general_autofill_title);
             bar.setDisplayHomeAsUpEnabled(false);
+            bar.setHomeButtonEnabled(false);
         }
     }
 

src/com/android/browser/BrowserPreferencesPage.java

diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index a40c7c7..3cbeb1a 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -21,6 +21,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.view.MenuItem;
 
 import com.android.browser.preferences.AboutPreferencesFragment;
 import com.android.browser.preferences.GeneralPreferencesFragment;
@@ -98,4 +99,18 @@
         getFragmentManager().beginTransaction().replace(android.R.id.content,
                 new GeneralPreferencesFragment()).commit();
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                if (getFragmentManager().getBackStackEntryCount() > 0) {
+                    getFragmentManager().popBackStack();
+                } else {
+                    finish();
+                }
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

src/com/android/browser/preferences/AccessibilityPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
index 4daecd1..2054165 100644
--- a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java
@@ -76,6 +76,7 @@
         if (bar != null) {
             bar.setTitle(R.string.pref_accessibility_title);
             bar.setDisplayHomeAsUpEnabled(false);
+            bar.setHomeButtonEnabled(false);
         }
     }
 

src/com/android/browser/preferences/DebugPreferencesFragment.java

diff --git a/src/com/android/browser/preferences/DebugPreferencesFragment.java b/src/com/android/browser/preferences/DebugPreferencesFragment.java
index 413e463..09f19ef 100644
--- a/src/com/android/browser/preferences/DebugPreferencesFragment.java
+++ b/src/com/android/browser/preferences/DebugPreferencesFragment.java
@@ -48,6 +48,7 @@
         if (bar != null) {
             bar.setTitle(R.string.pref_development_title);
             bar.setDisplayHomeAsUpEnabled(false);
+            bar.setHomeButtonEnabled(false);
         }
     }
 }

src/com/android/browser/preferences/WebsiteSettingsFragment.java

diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index 259a3e1..9fe18c5 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -772,6 +772,7 @@
         if (bar != null) {
             bar.setTitle(R.string.pref_extras_website_settings);
             bar.setDisplayHomeAsUpEnabled(false);
+            bar.setHomeButtonEnabled(false);
         }
     }