Remove the search bar from the bookmarks page.

Now that the bookmarks page is no longer the landing page, there is
no need to have a search bar at the top.  Since there is now more
screen real estate, turn the mini-tabs back into regular tabs, and
return their icons.  Also switch the states to look appropriate with
the new look of tabs.

Change-Id: I4cf3544753a16a57caf7a8cf1bf375008caad67c

1 files changed, 19 insertions, 27 deletions

diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
index a8b8031..9d25eb1 100644
--- a/res/layout/tabs.xml
+++ b/res/layout/tabs.xml
@@ -13,36 +13,28 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.browser.CombinedBookmarkHistoryActivity$CustomViewGroup"
-    android:id="@+id/holder"
-    android:orientation="vertical"
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-    <TabHost
-        android:id="@android:id/tabhost"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 
-        <LinearLayout
-            android:orientation="vertical"
+        <TabWidget android:id="@android:id/tabs"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent">
-
-            <TabWidget android:id="@android:id/tabs"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="1dip"
-                android:paddingRight="1dip"
-                android:paddingTop="4dip"
-            />
+            android:layout_height="wrap_content"
+            android:paddingLeft="1dip"
+            android:paddingRight="1dip"
+            android:paddingTop="4dip"
+        />
 
-            <FrameLayout android:id="@android:id/tabcontent"
-                android:layout_width="fill_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1"
-            />
-        </LinearLayout>
-    </TabHost>
-</view>
+        <FrameLayout android:id="@android:id/tabcontent"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+        />
+    </LinearLayout>
+</TabHost>