Clean visual style: move to Light, add Material support, change Drawables (progress, icons).
This code alters the visual style moving the APP to a Light theme.
Parents of the theme are either Theme.Holo.Light or Theme.Material.Light
depending on which API we start the APK from. Needs SDK 21 to build.
Other than the visual changes, this commit changes:
- name of the APP to 'Browser'
- animations and sequencing of the Tab switcher in {nav/anim}_screen
- removal of the warning icon from the Exit dialog
- change of the favicon appearance (removal of the double border)
Vast amount of unused resources are removed from the APK. Just XHDPI
drawables have been synthesized for now, and the Primary color was
used for the icons and is accessible in R.color.Primary.
Change-Id: If75cc051c5d4015383e96066cdb6507484e625d8
diff --git a/res/layout/anim_screen.xml b/res/layout/anim_screen.xml
index 0cdc931..9dc91d5 100644
--- a/res/layout/anim_screen.xml
+++ b/res/layout/anim_screen.xml
@@ -14,21 +14,27 @@
limitations under the License.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:focusable="false"
- android:background="@drawable/browser_background_holo">
- <ImageView
- android:id="@+id/title"
+ android:orientation="vertical">
+
+ <!-- obfuscate with the same color as the tabs Nav background -->
+ <View
android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height" />
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/toolbar_height"
+ android:background="@color/TabNavBackgroundColor" />
+
+ <!-- the moving preview (manually placed) -->
<ImageView
- android:id="@+id/content"
+ android:id="@+id/anim_screen_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white" />
-</LinearLayout>
+
+ <!-- block the size of the menu (to protect touch during animations) -->
+ <!-- View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height" / -->
+</FrameLayout>
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index fb6fa37..0e8051a 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -23,15 +23,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/black"
+ android:background="@color/NavigationBarBackground"
android:layout_gravity="right"
android:gravity="right" >
- <ImageButton android:id="@+id/subwindow_close"
- style="@style/HoloButton"
- android:focusable="true"
+ <ImageButton
+ android:id="@+id/subwindow_close"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_close_window_holo_dark" />
+ android:focusable="true"
+ android:src="@drawable/ic_action_stop" />
</LinearLayout>
<LinearLayout
android:id="@+id/inner_container"
diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml
index 61c455c..d166d80 100644
--- a/res/layout/custom_screen.xml
+++ b/res/layout/custom_screen.xml
@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout android:id="@+id/fullscreen_custom_content"
android:visibility="gone"
- android:background="@color/black"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
index d63ef84..b42b3f9 100755
--- a/res/layout/geolocation_permissions_prompt.xml
+++ b/res/layout/geolocation_permissions_prompt.xml
@@ -18,43 +18,44 @@
<com.android.browser.GeolocationPermissionsPrompt
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="@color/TabPassiveMessageBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/geolocation_permissions_prompt_background"
- android:visibility="gone">
+ android:orientation="vertical">
+
+ <!-- Cosmetic separator -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/TabPassiveMessageLine" />
<!-- 'google.com wants to know your location' -->
<TextView android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:singleLine="true"
- android:scrollHorizontally="true"
- android:padding="6dip"
+ android:paddingBottom="4dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="16dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
- <CheckBox android:id="@+id/remember"
- android:layout_width="wrap_content"
+ <CheckBox
+ android:id="@+id/remember"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/message"
- android:layout_alignLeft="@id/message" />
- <TextView
- android:paddingLeft="4dip"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
android:text="@string/geolocation_permissions_prompt_remember"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_alignBaseline="@id/remember"
- android:layout_toRightOf="@id/remember" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/remember"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="beginning"
- android:dividerPadding="16dip"
- android:background="@null">
+ android:layout_marginTop="8dp"
+ android:dividerPadding="16dip" >
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml
index 7247ee1..cdee2fd 100644
--- a/res/layout/menu_item.xml
+++ b/res/layout/menu_item.xml
@@ -20,8 +20,6 @@
android:layout_gravity="start"
android:gravity="center_vertical"
android:singleLine="true"
- android:paddingLeft="16dp"
- android:paddingEnd="9dp"
/>
<view
class="com.android.browser.appmenu.AppMenuItemIcon"
@@ -37,6 +35,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:tint="@color/black"
- android:visible="false"
+ android:visibility="gone"
android:clickable="true" />
</LinearLayout>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index c655727..51109f7 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -14,49 +14,58 @@
limitations under the License.
-->
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/nav_screen"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/browser_background_holo">
+ android:background="@color/TabNavBackgroundColor"
+ android:orientation="vertical">
+
<com.android.browser.NavTabScroller
android:id="@+id/scroller"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical" />
+ android:orientation="@integer/nav_tab_orientation" />
+
+ <!-- Tabs toolbar -->
<LinearLayout
- android:id="@+id/tabbar"
- android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
- android:layout_gravity="top"
- android:gravity="right"
- android:background="#CC0d0d0d">
- <ImageButton
- android:id="@+id/newtab"
+ android:background="@color/NavigationBarBackground"
+ android:gravity="end"
+ android:orientation="horizontal">
+
+ <!-- animated subset -->
+ <LinearLayout
+ android:id="@+id/nav_toolbar_animate"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_newtab"
- android:src="@drawable/ic_new_window_holo_dark" />
- <ImageButton
- android:id="@+id/bookmarks"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:contentDescription="@string/accessibility_button_bookmarks"
- android:src="@drawable/ic_bookmarks_history_holo_dark"
- style="@style/HoloButton" />
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/newtab"
+ style="@style/NavButtonWide"
+ android:contentDescription="@string/accessibility_button_newtab"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_action_add_tab" />
+
+ <ImageButton
+ android:id="@+id/newincognitotab"
+ style="@style/NavButtonWide"
+ android:contentDescription="@string/accessibility_button_newincognitotab"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_action_add_incognito" />
+ </LinearLayout>
+
<ImageButton
android:id="@+id/more"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_more"
- android:src="@drawable/ic_menu_overflow" />
+ style="@style/OverflowButton" />
</LinearLayout>
-</RelativeLayout>
+
+ <!-- Cosmetic shadow (covered by anim_screen during transitions) -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="8dp"
+ android:layout_marginTop="@dimen/toolbar_height"
+ android:background="@drawable/deco_cosmetic_topshadow" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index d1205f0..36e2082 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@drawable/nav_tab_bg"
+ android:background="@drawable/nav_tab_title"
android:focusable="false">
<LinearLayout
android:id="@+id/titlebar"
@@ -41,19 +41,20 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:scrollHorizontally="true"
android:drawablePadding="8dip" />
+
<ImageView
android:id="@+id/closetab"
- android:src="@drawable/ic_tab_close"
- android:layout_gravity="center_vertical"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingRight="16dip"
+ android:layout_gravity="center_vertical"
android:contentDescription="@string/accessibility_button_closetab"
- style="@style/HoloButton" />
+ android:paddingRight="16dip"
+ android:src="@drawable/ic_action_stop" />
</LinearLayout>
+
+ <!-- Preview Image -->
<ImageView
android:id="@+id/tab_view"
- android:src="@drawable/ic_stop_holo_dark"
android:layout_width="@dimen/nav_tab_width"
android:layout_height="@dimen/nav_tab_height"
android:paddingLeft="2dip"
diff --git a/res/layout/one_button_plus_menu_item.xml b/res/layout/one_button_plus_menu_item.xml
index 278611c..29eaf57 100644
--- a/res/layout/one_button_plus_menu_item.xml
+++ b/res/layout/one_button_plus_menu_item.xml
@@ -21,11 +21,6 @@
<ImageButton
android:id="@+id/button_two"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="6"
- android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center"
- />
+ style="@style/OverflowButton" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index a9a70fd..bbb22a5 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -10,24 +10,23 @@
the specific language governing permissions and limitations under the
License.
-->
-<merge
- xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tabbarcontent"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
- android:orientation="horizontal"
- >
+ android:orientation="horizontal">
+
<com.android.browser.TabScrollView
android:id="@+id/tabs"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:orientation="horizontal" />
+
<ImageButton
android:id="@+id/newtab"
- android:src="@drawable/ic_menu_new_window"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:background="@drawable/add_tab_selector" />
+ android:background="@drawable/add_tab_selector"
+ android:src="@drawable/ic_menu_new_window" />
</merge>
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 8a5e308..57251d9 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:src="@drawable/ic_search_category_history"
+ android:src="@drawable/ic_suggest_history_normal"
android:contentDescription="@string/accessibility_state_frozen"
android:visibility="gone" />
<ImageView
diff --git a/res/layout/three_button_plus_menu_item.xml b/res/layout/three_button_plus_menu_item.xml
index e0cc23b..631690d 100644
--- a/res/layout/three_button_plus_menu_item.xml
+++ b/res/layout/three_button_plus_menu_item.xml
@@ -45,12 +45,5 @@
<ImageButton
android:id="@+id/button_four"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="6"
- android:paddingStart="11dp"
- android:paddingEnd="11dp"
- android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center"
- android:tint="@color/black" />
+ style="@style/OverflowButton" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index 7771c59..d972dd7 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -22,23 +22,39 @@
android:focusableInTouchMode="true"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <include
- layout="@layout/title_bar_nav"
- android:id="@+id/taburlbar"
+
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height" />
- <ViewStub
- android:id="@+id/snapshotbar_stub"
- android:layout="@layout/title_bar_snapshot"
- android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height" />
+ android:layout_height="@dimen/toolbar_height">
+
+ <include
+ layout="@layout/title_bar_nav"
+ android:id="@+id/taburlbar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height" />
+
+ <ViewStub
+ android:id="@+id/snapshotbar_stub"
+ android:layout="@layout/title_bar_snapshot"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height" />
+
+ <!-- Cosmetic separator -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_gravity="bottom"
+ android:background="@color/NavigationBarUnderline" />
+ </FrameLayout>
+
+ <!-- the main Progress view -->
<com.android.browser.PageProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:layout_gravity="bottom"
- android:src="@drawable/progress"
+ android:src="@drawable/deco_progress_bar"
android:layout_marginTop="@dimen/progress_bar_margin"
android:visibility="gone" />
</LinearLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 3ee99fd..b9952f1 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -14,53 +14,55 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.NavigationBarPhone
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+<com.android.browser.NavigationBarPhone xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/NavigationBarBackground"
+ android:orientation="horizontal">
+
<LinearLayout
- android:id="@+id/title_bg"
android:layout_width="0dip"
- android:layout_weight="1.0"
android:layout_height="match_parent"
+ android:layout_weight="1.0"
android:gravity="center_vertical"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
android:orientation="horizontal">
- <ImageView
- android:id="@+id/magnify"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="4dip"
- android:paddingRight="8dip"
- android:visibility="gone"
- android:src="@drawable/ic_search_category_suggest" />
+
<ImageView
android:id="@+id/incognito_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="4dip"
- android:visibility="gone"
- android:src="@drawable/ic_incognito_holo_dark" />
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_incognito_holo_dark"
+ android:visibility="gone" />
+
<com.android.browser.LocationButton
android:id="@+id/location_button"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:visibility="gone"
- style="@style/HoloButton"/>
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/magnify"
+ android:layout_width="44dp"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_action_search_normal"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:visibility="visible" />
+
<FrameLayout
android:id="@+id/iconcombo"
+ style="@style/NavButton"
android:layout_width="44dip"
- android:layout_height="match_parent"
- android:contentDescription="@string/page_info"
- style="@style/HoloButton">
+ android:contentDescription="@string/page_info">
+
<ImageView
android:id="@+id/favicon"
android:layout_width="32dip"
android:layout_height="32dip"
- android:paddingLeft="4dip"
- android:paddingRight="8dip"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip" />
+
<ImageView
android:id="@+id/lock"
android:layout_width="32dip"
@@ -68,65 +70,80 @@
android:layout_gravity="center"
android:visibility="gone" />
</FrameLayout>
+
<ImageView
android:id="@+id/stop"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingLeft="4dip"
android:contentDescription="@string/accessibility_button_stop"
- android:src="@drawable/ic_stop_holo_dark"
- style="@style/HoloButton" />
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:src="@drawable/ic_action_stop" />
+
<com.android.browser.UrlInputView
android:id="@+id/url"
- android:focusable="true"
+ style="@style/Suggestions"
android:layout_width="0dip"
- android:layout_weight="1.0"
android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:background="@null"
+ android:ellipsize="end"
android:fadingEdge="horizontal"
android:fadingEdgeLength="24dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:focusable="true"
android:hint="@string/search_hint"
- android:singleLine="true"
- android:ellipsize="end"
- android:lines="1"
- android:scrollHorizontally="true"
- android:inputType="textUri"
android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
- style="@style/Suggestions"
- android:background="@null" />
+ android:inputType="textUri"
+ android:lines="1"
+ android:paddingLeft="4dp"
+ android:paddingRight="6dp"
+ android:scrollHorizontally="true"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
<ImageView
android:id="@+id/voice"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingRight="4dip"
android:contentDescription="@string/accessibility_button_voice"
- android:src="@drawable/ic_voice_search_holo_dark"
- style="@style/HoloButton"
- android:visibility="gone" />
- <ImageView
- android:id="@+id/clear"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:paddingRight="4dip"
+ android:src="@drawable/ic_voice_search_holo_dark"
+ android:visibility="gone" />
+
+ <ImageButton
+ android:id="@+id/clear"
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_clear"
- android:src="@drawable/ic_close_window_holo_dark"
- style="@style/HoloButton"
+ android:src="@drawable/ic_action_stop"
android:visibility="gone" />
</LinearLayout>
- <ImageButton
- android:id="@+id/tab_switcher"
- android:layout_width="wrap_content"
+
+ <FrameLayout
android:layout_height="match_parent"
+ android:layout_width="wrap_content">
+
+ <ImageButton
+ android:id="@+id/tab_switcher"
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_navscreen"
- android:src="@drawable/ic_windows_holo_dark"
- style="@style/HoloButton" />
+ android:src="@drawable/ic_action_tabswitcher" />
+
+ <TextView
+ android:id="@+id/tab_switcher_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:paddingBottom="3dp"
+ android:paddingRight="2dp"
+ android:clickable="false"
+ android:text="0" >
+ </TextView>
+ </FrameLayout>
+
<ImageButton
android:id="@+id/more_browser_settings"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_more"
- android:src="@drawable/ic_menu_overflow" />
+ style="@style/OverflowButton" />
</com.android.browser.NavigationBarPhone>
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index c46dd6f..13a35ac 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -18,10 +18,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+ android:orientation="horizontal" >
<ImageView
- android:src="@drawable/ic_search_category_history"
+ android:src="@drawable/ic_suggest_history_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="8dip" />
@@ -52,19 +51,31 @@
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
</FrameLayout>
- <ImageButton
- android:id="@+id/tab_switcher"
- android:layout_width="wrap_content"
+
+ <FrameLayout
android:layout_height="match_parent"
- android:src="@drawable/ic_windows_holo_dark"
- android:contentDescription="@string/accessibility_button_navscreen"
- style="@style/HoloButton" />
+ android:layout_width="wrap_content">
+
+ <ImageButton
+ android:id="@+id/tab_switcher"
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
+ android:contentDescription="@string/accessibility_button_navscreen"
+ android:src="@drawable/ic_action_tabswitcher" />
+
+ <TextView
+ android:id="@+id/tab_switcher_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:paddingBottom="3dp"
+ android:paddingRight="2dp"
+ android:clickable="false"
+ android:text="0" >
+ </TextView>
+ </FrameLayout>
+
<ImageButton
android:id="@+id/more"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:src="@drawable/ic_menu_moreoverflow_normal_holo_dark"
- android:contentDescription="@string/accessibility_button_more" />
+ style="@style/OverflowButton" />
</com.android.browser.SnapshotBar>
diff --git a/res/layout/two_button_plus_menu_item.xml b/res/layout/two_button_plus_menu_item.xml
index ae47f53..5ec508b 100644
--- a/res/layout/two_button_plus_menu_item.xml
+++ b/res/layout/two_button_plus_menu_item.xml
@@ -30,10 +30,5 @@
<ImageButton
android:id="@+id/button_three"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="6"
- android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center"
- />
+ style="@style/OverflowButton" />
</LinearLayout>
\ No newline at end of file