commit 652d08ed4c671f7093246c2cc82d6e3b12fc38d5
author Axesh  R. Ajmera <aajmera@codeaurora.org> Mon Jun 16 16:36:33 2014 -0700
committer WebTech Code Review <code-review@localhost> Tue Jun 17 12:16:16 2014 -0700
tree be8419cf3c36dd2e61b391055d4772f9b297ede0
parent 70a6ec7db4365f33a6ad50f3c8a84b464d8918b7

Fix for about menu

- Fixes the non-functional "About" menu

Change-Id: I0cbdde6e7740e52dddfb165d024966e09108587b

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 105dd0d..df926ad 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -268,22 +268,6 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (!mController.onOptionsItemSelected(item)) {
-            if (item.getItemId() == R.id.about_menu_id) {
-                final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(R.string.about);
-                builder.setCancelable(true);
-                String ua = "";
-                final WebView current = getController().getCurrentWebView();
-                if (current != null) {
-                    final WebSettings s = current.getSettings();
-                    if (s != null) {
-                        ua = s.getUserAgentString();
-                    }
-                }
-                builder.setMessage("Agent:" + ua);
-                builder.setPositiveButton(android.R.string.ok, null);
-                builder.create().show();
-            }
             return super.onOptionsItemSelected(item);
         }
         return true;

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 8bd85f6..27b8ce6 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2049,6 +2049,23 @@
                 }
                 break;
 
+            case R.id.about_menu_id:
+                final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                builder.setTitle(R.string.about);
+                builder.setCancelable(true);
+                String ua = "";
+                final WebView currentWebView = getCurrentWebView();
+                if (currentWebView != null) {
+                    final WebSettings s = currentWebView.getSettings();
+                    if (s != null) {
+                        ua = s.getUserAgentString();
+                    }
+                }
+                builder.setMessage("Agent:" + ua);
+                builder.setPositiveButton(android.R.string.ok, null);
+                builder.create().show();
+                break;
+
             default:
                 return false;
         }