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
diff --git a/res/drawable/browser_bookmark_tab.xml b/res/drawable/browser_bookmark_tab.xml
index 76684cb..1a42f99 100644
--- a/res/drawable/browser_bookmark_tab.xml
+++ b/res/drawable/browser_bookmark_tab.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_tab_browser_bookmark_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_browser_bookmark_unselected"/>
+ <!-- Selected states are reversed because the look of tabs has changed -->
+ <item android:state_selected="false" android:drawable="@drawable/ic_tab_browser_bookmark_selected"/>
+ <item android:state_selected="true" android:drawable="@drawable/ic_tab_browser_bookmark_unselected"/>
</selector>
diff --git a/res/drawable/browser_history_tab.xml b/res/drawable/browser_history_tab.xml
index b5329ea..4c88fe0 100644
--- a/res/drawable/browser_history_tab.xml
+++ b/res/drawable/browser_history_tab.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_tab_browser_history_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_browser_history_unselected"/>
+ <!-- Selected states are reversed because the look of tabs has changed -->
+ <item android:state_selected="false" android:drawable="@drawable/ic_tab_browser_history_selected"/>
+ <item android:state_selected="true" android:drawable="@drawable/ic_tab_browser_history_unselected"/>
</selector>
diff --git a/res/drawable/browser_visited_tab.xml b/res/drawable/browser_visited_tab.xml
index d1b4404..aa828df 100644
--- a/res/drawable/browser_visited_tab.xml
+++ b/res/drawable/browser_visited_tab.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_tab_browser_visited_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_browser_visited_unselected"/>
+ <!-- Selected states are reversed because the look of tabs has changed -->
+ <item android:state_selected="false" android:drawable="@drawable/ic_tab_browser_visited_selected"/>
+ <item android:state_selected="true" android:drawable="@drawable/ic_tab_browser_visited_unselected"/>
</selector>
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">
+ android:layout_height="wrap_content"
+ android:paddingLeft="1dip"
+ android:paddingRight="1dip"
+ android:paddingTop="4dip"
+ />
- <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"
- />
-
- <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>