summaryrefslogtreecommitdiffstats
path: root/res/layout-sw600dp
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout-sw600dp')
-rw-r--r--res/layout-sw600dp/suggestion_item.xml85
-rw-r--r--res/layout-sw600dp/title_bar_nav.xml20
-rw-r--r--res/layout-sw600dp/title_bar_snapshot.xml4
3 files changed, 98 insertions, 11 deletions
diff --git a/res/layout-sw600dp/suggestion_item.xml b/res/layout-sw600dp/suggestion_item.xml
new file mode 100644
index 0000000..020ba58
--- /dev/null
+++ b/res/layout-sw600dp/suggestion_item.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:baselineAligned="false"
+ >
+ <LinearLayout
+ android:id="@+id/suggestion"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="horizontal"
+ android:background="?android:attr/selectableItemBackground"
+ android:padding="0dp">
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/icon1"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="@dimen/suggest_item_padding"
+ android:layout_marginRight="@dimen/suggest_item_padding" />
+ <LinearLayout
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:orientation="vertical">
+ <TextView
+ android:id="@android:id/text1"
+ style="@style/SuggestionLineMedium"
+ android:maxLines="1"
+ android:textColor="@color/black"
+ android:textColorHint="@color/black"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ <TextView
+ android:id="@android:id/text2"
+ style="@style/SuggestionLineSmall"
+ android:singleLine="true"
+ android:textColor="@color/black"
+ android:textColorHint="@color/black"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+ </LinearLayout>
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/divider"
+ android:scaleType="center"
+ android:background="@*android:drawable/list_divider_holo_light"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:id="@+id/icon2"
+ android:scaleType="center"
+ android:src="@drawable/ic_querybuilder"
+ android:background="?android:attr/selectableItemBackground"
+ android:paddingRight="@dimen/suggest_item_padding"
+ android:paddingLeft="@dimen/suggest_item_padding"
+ />
+</LinearLayout>
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index a6b8a32..62e0d78 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -17,7 +17,8 @@
<com.android.browser.NavigationBarTablet
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+ android:elevation="5dp"
+ android:background="@color/primary">
<LinearLayout
android:id="@+id/navbuttons"
android:layout_width="wrap_content"
@@ -25,14 +26,14 @@
android:orientation="horizontal">
<ImageButton
android:id="@+id/back"
- android:src="@drawable/ic_back_holo_dark"
+ android:src="@drawable/ic_back_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_back"
style="@style/HoloButton" />
<ImageButton
android:id="@+id/forward"
- android:src="@drawable/ic_forward_holo_dark"
+ android:src="@drawable/ic_forward_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_forward"
@@ -44,7 +45,7 @@
style="@style/HoloButton"
android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_stop"
- android:src="@drawable/ic_stop_holo_dark" />
+ android:src="@drawable/ic_stop_dark" />
</LinearLayout>
<LinearLayout
android:id="@+id/urlbar_focused"
@@ -57,7 +58,7 @@
android:id="@+id/url_icon"
android:layout_width="32dip"
android:layout_height="20dip"
- android:src="@drawable/ic_web_holo_dark"
+ android:src="@drawable/ic_web_dark"
android:layout_gravity="center" />
<ImageView
android:id="@+id/lock"
@@ -83,6 +84,7 @@
android:scrollHorizontally="true"
android:inputType="textUri"
android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+ android:theme="@style/Widget.UrlInputView"
style="@style/Suggestions" />
<ImageButton
android:id="@+id/star"
@@ -93,14 +95,14 @@
style="@style/HoloButton" />
<ImageButton
android:id="@+id/clear"
- android:src="@drawable/ic_stop_holo_dark"
+ android:src="@drawable/ic_stop_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_clear"
style="@style/HoloButton" />
<ImageButton
android:id="@+id/voice"
- android:src="@drawable/ic_voice_search_holo_dark"
+ android:src="@drawable/ic_voice_search_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_voice"
@@ -108,7 +110,7 @@
</LinearLayout>
<ImageButton
android:id="@+id/search"
- android:src="@drawable/ic_search_holo_dark"
+ android:src="@drawable/ic_search_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
@@ -121,5 +123,5 @@
android:scaleType="center"
style="@style/HoloButton"
android:contentDescription="@string/accessibility_button_bookmarks"
- android:src="@drawable/ic_bookmarks_history_holo_dark" />
+ android:src="@drawable/ic_bookmarks_history_dark" />
</com.android.browser.NavigationBarTablet>
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml
index a2cc9d0..2155e70 100644
--- a/res/layout-sw600dp/title_bar_snapshot.xml
+++ b/res/layout-sw600dp/title_bar_snapshot.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+ android:background="@color/primary_dark">
<ImageView
android:id="@+id/date_icon"
android:src="@drawable/ic_search_category_history"
@@ -50,6 +50,6 @@
android:scaleType="center"
android:paddingRight="16dip"
style="@style/HoloButton"
- android:src="@drawable/ic_bookmarks_history_holo_dark"
+ android:src="@drawable/ic_bookmarks_history_dark"
android:contentDescription="@string/accessibility_button_bookmarks" />
</com.android.browser.SnapshotBar>
generated by cgit v1.1 at 2024-12-23 09:35:48 +0000