Bookmarks page UI updates

 Bug: 3248628
 Updates the bookmark page UI based off of the newest UI design
 document.

Change-Id: I26447b7e1c38798b3c229c9d8c10af2565458a7b

5 files changed, 34 insertions, 27 deletions

diff --git a/res/drawable-hdpi/ic_home.png b/res/drawable-hdpi/ic_home.png
new file mode 100644
index 0000000..2b5fd01
--- /dev/null
+++ b/res/drawable-hdpi/ic_home.png
diff --git a/res/drawable-mdpi/ic_home.png b/res/drawable-mdpi/ic_home.png
new file mode 100644
index 0000000..df2dbc6
--- /dev/null
+++ b/res/drawable-mdpi/ic_home.png
diff --git a/res/layout/bookmarks_header.xml b/res/layout/bookmarks_header.xml
index 05bfa32..5d83892 100644
--- a/res/layout/bookmarks_header.xml
+++ b/res/layout/bookmarks_header.xml
@@ -19,18 +19,6 @@
     android:layout_height="48dip"
     android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/root_folder"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:text="@string/defaultBookmarksUpButton"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center_vertical"
-        android:visibility="gone"
-        android:paddingLeft="16dip"
-        android:drawableLeft="@drawable/ic_tab_bookmarks_selected"
-        android:drawablePadding="16dip" />
-
     <com.android.browser.BreadCrumbView
         android:id="@+id/crumbs"
         android:layout_width="0dip"
diff --git a/res/layout/bookmarks_history.xml b/res/layout/bookmarks_history.xml
index a3a5084..3294434 100644
--- a/res/layout/bookmarks_history.xml
+++ b/res/layout/bookmarks_history.xml
@@ -18,8 +18,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="8dip"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip"
     android:orientation="vertical"
     android:background="@color/black">
     <LinearLayout
@@ -29,33 +27,38 @@
         <LinearLayout
             android:id="@+id/tabs"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            style="@style/ActionBarStyle">
             <TextView
-                android:id="@+id/historytab"
+                android:id="@+id/bmtab"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:paddingLeft="32dip"
                 android:paddingRight="32dip"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:gravity="center_vertical"
-                android:text="@string/tab_history"
-                android:drawableLeft="@drawable/ic_tab_history_selected"
-                android:drawablePadding="16dip" />
+                android:text="@string/bookmarks"
+                android:drawableLeft="@drawable/ic_tab_bookmarks_selected"
+                android:drawablePadding="16dip"
+                android:background="@drawable/tab_background" />
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:src="@drawable/divider_vert" />
             <TextView
-                android:id="@+id/bmtab"
+                android:id="@+id/historytab"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:paddingLeft="32dip"
                 android:paddingRight="32dip"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:gravity="center_vertical"
-                android:text="@string/bookmarks"
-                android:drawableLeft="@drawable/ic_tab_bookmarks_selected"
-                android:drawablePadding="16dip" />
+                android:text="@string/tab_history"
+                android:drawableLeft="@drawable/ic_tab_history_selected"
+                android:drawablePadding="16dip"
+                android:background="@drawable/tab_background" />
         </LinearLayout>
 
         <FrameLayout
@@ -83,6 +86,22 @@
             android:drawableLeft="@drawable/ic_favorite_off_normal"
             android:drawablePadding="16dip" />
 
+        <ImageView
+            android:id="@+id/seperate_select_add"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingLeft="16dip"
+            android:src="@drawable/divider_vert" />
+
+        <ImageView
+            android:id="@+id/home"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:src="@drawable/ic_home"
+            android:paddingRight="16dip"
+            android:paddingLeft="16dip"
+            android:scaleType="center" />
+
     </LinearLayout>
     <FrameLayout
         android:id="@+id/fragment"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ece6ffa..b1c04dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -188,11 +188,11 @@
             showing. -->
     <string name="bookmark_page">Bookmark last-viewed page</string>
     <!-- Menu item in the page that displays all bookmarks.  Switches to
-            a grid view which shows thumbnails [CHAR LIMIT=50] -->
-    <string name="bookmark_thumbnail_view">Thumbnail view</string>
+            a grid view which shows thumbnails [CHAR LIMIT=20] -->
+    <string name="bookmark_thumbnail_view">Thumbnails</string>
     <!-- Menu item in the page that displays all bookmarks.  Switches to a
-            list view which shows titles [CHAR LIMIT=50] -->
-    <string name="bookmark_list_view">List view</string>
+            list view which shows titles [CHAR LIMIT=20] -->
+    <string name="bookmark_list_view">List</string>
     <!-- Summary text under the New Bookmark item on the Bookmarks screen.
             Tells the user that if they select this item, it will bring up a
             dialog to bookmark the page that the browser is currently viewing,