Add bookmark search feature to enhanced bookmark

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
index c5136865bad094b9dcb3f7252e83676cc7a3994c..9ebeb1397bcbd2537018264e8e3d968be89ab007 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActionBar.java
@@ -15,9 +15,11 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 
-import org.chromium.chrome.R;
+import com.google.android.apps.chrome.R;
+
 import org.chromium.chrome.browser.BookmarksBridge.BookmarkItem;
 import org.chromium.chrome.browser.BookmarksBridge.BookmarkModelObserver;
+import org.chromium.chrome.browser.enhanced_bookmarks.EnhancedBookmarksModel;

[Kibeom Kim (inactive), 2015/08/10 07:47:38]

s/enhanced_bookmarks/enhancedbookmarks

 import org.chromium.chrome.browser.widget.NumberRollView;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
@@ -82,6 +84,12 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
         if (menuItem.getItemId() == R.id.edit_menu_id) {
             EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                     mCurrentFolder.getId());
+        } else if (menuItem.getItemId() == R.id.list_toggle_menu_id) {
+            mDelegate.setListModeEnabled(!mDelegate.isListModeEnabled());
+            return true;

[Kibeom Kim (inactive), 2015/08/10 07:47:38]

added by mistake?

+        } else if (menuItem.getItemId() == R.id.search_menu_id) {
+            mDelegate.openSearchUI();
+            return true;
         } else if (menuItem.getItemId() == R.id.close_menu_id) {
             mDelegate.finishActivityOnPhone();
             return true;
@@ -93,7 +101,7 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
                 EnhancedBookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                         item.getId());
             } else {
-                EnhancedBookmarkUtils.startEditActivity(getContext(), item.getId());
+                mDelegate.startDetailActivity(item.getId(), null);

[Kibeom Kim (inactive), 2015/08/10 07:47:38]

I guess the previous one is correct if we use have imported the correct
EnhancedBookmarksModel.

             }
             return true;
         } else if (menuItem.getItemId() == R.id.selection_mode_move_menu_id) {
@@ -180,7 +188,9 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
     void showLoadingUi() {
         setTitle(null);
         setNavigationButton(NAVIGATION_BUTTON_NONE);
+        getMenu().findItem(R.id.search_menu_id).setVisible(false);
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
+        getMenu().findItem(R.id.list_toggle_menu_id).setVisible(false);

[Kibeom Kim (inactive), 2015/08/10 07:47:38]

mistake?

     }
 
     // EnhancedBookmarkUIObserver implementations.
@@ -189,19 +199,21 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
     public void onEnhancedBookmarkDelegateInitialized(EnhancedBookmarkDelegate delegate) {
         mDelegate = delegate;
         mDelegate.addUIObserver(this);
-        delegate.getModel().addObserver(mBookmarkModelObserver);
+        delegate.getModel().addModelObserver(mBookmarkModelObserver);
+        getMenu().findItem(R.id.list_toggle_menu_id).setVisible(true);

[Kibeom Kim (inactive), 2015/08/10 07:47:38]

mistake?

     }
 
     @Override
     public void onDestroy() {
         mDelegate.removeUIObserver(this);
-        mDelegate.getModel().removeObserver(mBookmarkModelObserver);
+        mDelegate.getModel().removeModelObserver(mBookmarkModelObserver);
     }
 
     @Override
     public void onAllBookmarksStateSet() {
         setTitle(R.string.enhanced_bookmark_title_bar_all_items);
         setNavigationButton(NAVIGATION_BUTTON_MENU);
+        getMenu().findItem(R.id.search_menu_id).setVisible(true);
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
     }
 
@@ -209,6 +221,7 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
     public void onFolderStateSet(BookmarkId folder) {
         mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
 
+        getMenu().findItem(R.id.search_menu_id).setVisible(false);
         getMenu().findItem(R.id.edit_menu_id).setVisible(mCurrentFolder.isEditable());
 
         // If the parent folder is a top level node, we don't go up anymore.
@@ -249,7 +262,8 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
                 }
             }
 
-            setBackgroundColor(getResources().getColor(R.color.light_active_color));
+            setBackgroundColor(getResources().getColor(
+                    R.color.enhanced_bookmark_selection_action_bar_background));
 
             numberRollView.setVisibility(View.VISIBLE);
             if (!wasSelectionEnabled) numberRollView.setNumber(0, false);
@@ -257,8 +271,7 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
         } else {
             getMenu().setGroupVisible(R.id.normal_menu_group, true);
             getMenu().setGroupVisible(R.id.selection_mode_menu_group, false);
-            setBackgroundColor(
-                    getResources().getColor(R.color.enhanced_bookmark_appbar_background));
+            setBackgroundColor(getResources().getColor(R.color.default_primary_color));
 
             numberRollView.setVisibility(View.GONE);
             numberRollView.setNumber(0, false);
@@ -266,4 +279,18 @@ public class EnhancedBookmarkActionBar extends Toolbar implements EnhancedBookma
             mDelegate.notifyStateChange(this);
         }
     }
+
+    @Override
+    public void onFilterStateSet(String filter) {
+        setTitle(filter);
+        setNavigationButton(NAVIGATION_BUTTON_MENU);
+        getMenu().findItem(R.id.search_menu_id).setVisible(false);
+        getMenu().findItem(R.id.edit_menu_id).setVisible(false);
+    }
+
+    @Override
+    public void onListModeChange(boolean isListModeEnabled) {
+        MenuItem menuItem = getMenu().findItem(R.id.list_toggle_menu_id);
+        menuItem.getIcon().setLevel(isListModeEnabled ? 1 : 0);
+    }

[Kibeom Kim (inactive), 2015/08/10 07:47:38]

Mistake block?

 }