commit 49b7925ec66faf5015fdd1862eada2978ddd5fde
author Pankaj Garg <pgarg@codeaurora.org> Fri Nov 07 17:33:41 2014 -0800
committer WebTech Code Review <code-review@localhost> Wed Nov 26 10:30:10 2014 -0800
tree e43ee53fe74f629317c2dd5e5702e8a5f496178a
parent aa42e9f7002450bb759d9bc5e2540deb88b97fa1

Updates to SWE browser's options menu

- Changed the contents of the menu
- Iconified frequently used items
- Changes to layout and menu animation
- Removed popup menu from History and Bookmarks page
-- Added buttons to these pages to replace menu items
- Updated icons used in popup menu
- Added menu option to save link to homepage
- Add bookmark icon color depicts if bookmark exists

Change-Id: I37226506737647367f71159f1a439cc3fca4ae03

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 16eae77..7abe07b 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -45,6 +45,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
 import android.widget.Toast;
@@ -169,31 +170,6 @@
         }
     }
 
-    //add for carrier feature which adds new bookmark/folder function.
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.bookmark, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        final Activity activity = getActivity();
-        if (item.getItemId() == R.id.add_bookmark_menu_id) {
-            Intent intent = new Intent(activity, AddBookmarkPage.class);
-            intent.putExtra(BrowserContract.Bookmarks.URL, "http://");
-            intent.putExtra(BrowserContract.Bookmarks.TITLE, "");
-            intent.putExtra(BrowserContract.Bookmarks.PARENT, mCurrentFolderId);
-            activity.startActivity(intent);
-        }
-        if (item.getItemId() == R.id.new_bmfolder_menu_id) {
-            Intent intent = new Intent(activity, AddBookmarkFolder.class);
-            intent.putExtra(BrowserContract.Bookmarks.PARENT, mCurrentFolderId);
-            activity.startActivity(intent);
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         if (!(item.getMenuInfo() instanceof BookmarkContextMenuInfo)) {
@@ -373,7 +349,6 @@
         }
         Bundle args = getArguments();
         mDisableNewWindow = args == null ? false : args.getBoolean(EXTRA_DISABLE_WINDOW, false);
-        setHasOptionsMenu(true);
         if (mCallbacks == null && getActivity() instanceof CombinedBookmarksCallbacks) {
             mCallbacks = new CombinedBookmarksCallbackWrapper(
                     (CombinedBookmarksCallbacks) getActivity());
@@ -423,6 +398,7 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
+        final Activity activity = getActivity();
         mRoot = inflater.inflate(R.layout.bookmarks, container, false);
         mEmptyView = mRoot.findViewById(android.R.id.empty);
 
@@ -432,6 +408,28 @@
         mGrid.setBreadcrumbController(this);
         setEnableContextMenu(mEnableContextMenu);
 
+        Button btn = (Button) mRoot.findViewById(R.id.add_bookmark_button);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(activity, AddBookmarkPage.class);
+                intent.putExtra(BrowserContract.Bookmarks.URL, "http://");
+                intent.putExtra(BrowserContract.Bookmarks.TITLE, "");
+                intent.putExtra(BrowserContract.Bookmarks.PARENT, mCurrentFolderId);
+                activity.startActivity(intent);
+            }
+        });
+
+        btn = (Button) mRoot.findViewById(R.id.new_bmfolder_button);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(activity, AddBookmarkFolder.class);
+                intent.putExtra(BrowserContract.Bookmarks.PARENT, mCurrentFolderId);
+                activity.startActivity(intent);
+            }
+        });
+
         // Start the loaders
         LoaderManager lm = getLoaderManager();
         lm.restartLoader(LOADER_ACCOUNTS, null, this);
@@ -604,7 +602,6 @@
         mGrid.setColumnWidthFromLayout(R.layout.bookmark_thumbnail);
         int paddingTop = (int) res.getDimension(R.dimen.combo_paddingTop);
         mRoot.setPadding(0, paddingTop, 0, 0);
-        getActivity().invalidateOptionsMenu();
     }
 
     /**