summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/add_new_bookmark.xml20
-rw-r--r--res/layout/bookmark_grid_row.xml2
-rw-r--r--res/layout/bookmark_group_view.xml2
-rw-r--r--res/layout/bookmark_list.xml1
-rw-r--r--res/layout/bookmark_thumbnail.xml1
-rw-r--r--res/layout/bookmarks_drag_actionmode.xml6
-rw-r--r--res/layout/bookmarks_header.xml1
-rw-r--r--res/layout/browser_add_bookmark_content.xml4
-rw-r--r--res/layout/browser_subwindow.xml6
-rw-r--r--res/layout/folder_list_item.xml6
-rw-r--r--res/layout/nav_screen.xml36
-rw-r--r--res/layout/nav_tab_view.xml7
-rw-r--r--res/layout/new_folder_layout.xml2
-rw-r--r--res/layout/qc_menu_item.xml1
-rw-r--r--res/layout/qc_tab.xml2
-rw-r--r--res/layout/qc_tabs_view.xml3
-rwxr-xr-xres/layout/tab.xml7
-rw-r--r--res/layout/tab_bar.xml2
-rw-r--r--res/layout/tab_title.xml5
-rw-r--r--res/layout/title_bar.xml3
-rw-r--r--res/layout/title_bar_nav.xml16
-rw-r--r--res/layout/title_bar_snapshot.xml5
22 files changed, 85 insertions, 53 deletions
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index 53f7554bf..730b74e4d 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -4,9 +4,9 @@
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.
@@ -14,8 +14,8 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
@@ -31,7 +31,7 @@
android:layout_marginLeft="5dip"
android:layout_marginRight="11dip"
android:focusable="false"
- android:src="@drawable/ic_bookmark_on_holo_dark"
+ android:src="@drawable/ic_bookmark_on_dark"
android:scaleType="fitCenter"
/>
<LinearLayout
@@ -39,18 +39,18 @@
android:layout_height="wrap_content"
android:orientation="vertical"
>
- <TextView android:id="@+id/title"
+ <TextView android:id="@+id/title"
android:text="@string/add_new_bookmark"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textStyle="bold"
- android:layout_width="wrap_content"
+ android:textStyle="bold"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dip"
/>
- <TextView android:id="@+id/url"
+ <TextView android:id="@+id/url"
android:textAppearance="?android:attr/textAppearanceSmall"
android:maxLines="1"
- android:layout_width="wrap_content"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
diff --git a/res/layout/bookmark_grid_row.xml b/res/layout/bookmark_grid_row.xml
index 7955ad7f2..bb308ab9d 100644
--- a/res/layout/bookmark_grid_row.xml
+++ b/res/layout/bookmark_grid_row.xml
@@ -17,6 +17,6 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
+ android:theme="@style/PreferencesTheme"
android:layout_height="match_parent">
</LinearLayout>
-
diff --git a/res/layout/bookmark_group_view.xml b/res/layout/bookmark_group_view.xml
index e6c9628cf..69e0e75c8 100644
--- a/res/layout/bookmark_group_view.xml
+++ b/res/layout/bookmark_group_view.xml
@@ -19,6 +19,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
+ android:theme="@style/PreferencesTheme"
android:background="?android:attr/listChoiceBackgroundIndicator">
<TextView
@@ -35,4 +36,3 @@
android:layout_height="match_parent" />
</LinearLayout>
-
diff --git a/res/layout/bookmark_list.xml b/res/layout/bookmark_list.xml
index 4425a26c3..28fe255f1 100644
--- a/res/layout/bookmark_list.xml
+++ b/res/layout/bookmark_list.xml
@@ -21,6 +21,7 @@
android:layout_height="match_parent"
android:minHeight="@dimen/widgetItemMinHeight"
android:paddingLeft="16dip"
+ android:theme="@style/PreferencesTheme"
android:background="@drawable/bookmark_thumb_selector">
<ImageView
android:id="@+id/favicon"
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index cd7b9be01..0e80998e4 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -20,6 +20,7 @@
android:orientation="vertical"
android:padding="@dimen/combo_horizontalSpacing"
android:background="@drawable/bookmark_thumb_selector"
+ android:elevation="3dp"
>
<ImageView
diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml
index 64b104257..77e590fed 100644
--- a/res/layout/bookmarks_drag_actionmode.xml
+++ b/res/layout/bookmarks_drag_actionmode.xml
@@ -30,19 +30,19 @@
android:layout_height="match_parent"
android:paddingLeft="16dip"
android:paddingRight="16dip"
- android:src="@drawable/ic_web_holo_dark" />
+ android:src="@drawable/ic_web_dark" />
<ImageView
android:id="@+id/new_window_context_menu_id"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="16dip"
android:paddingRight="16dip"
- android:src="@drawable/ic_new_window_holo_dark" />
+ android:src="@drawable/ic_new_window_dark" />
<ImageView
android:id="@+id/info"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="16dip"
android:paddingRight="16dip"
- android:src="@drawable/ic_home_info_holo_dark" />
+ android:src="@drawable/ic_home_info_dark" />
</LinearLayout>
diff --git a/res/layout/bookmarks_header.xml b/res/layout/bookmarks_header.xml
index ba8cf2cf6..fc2d1f8e9 100644
--- a/res/layout/bookmarks_header.xml
+++ b/res/layout/bookmarks_header.xml
@@ -18,4 +18,5 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/crumbs"
android:layout_width="match_parent"
+ android:elevation="8dp"
android:layout_height="match_parent" />
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 58db8a561..6b4bad91a 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -61,7 +61,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
- android:drawableLeft="@drawable/ic_bookmark_on_holo_dark"
+ android:drawableLeft="@drawable/ic_bookmark_black"
android:text="@string/bookmark_this_page"
android:textAppearance="?android:attr/textAppearanceMedium" />
<View android:id="@+id/remove_divider"
@@ -76,7 +76,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/remove"
- android:drawableLeft="@drawable/trashcan"
+ android:drawableLeft="@drawable/ic_delete_black"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index fb6fa377b..e1f05d704 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -4,9 +4,9 @@
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.
@@ -31,7 +31,7 @@
android:focusable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_close_window_holo_dark" />
+ android:src="@drawable/ic_close_window_dark" />
</LinearLayout>
<LinearLayout
android:id="@+id/inner_container"
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 46cda37df..374c10f58 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -4,9 +4,9 @@
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.
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:src="@drawable/ic_folder_holo_dark" />
+ android:src="@drawable/ic_folder_dark" />
<TextView
android:id="@android:id/text1"
android:layout_width="match_parent"
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index c65572732..a6c331a81 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -32,21 +32,23 @@
android:layout_height="@dimen/toolbar_height"
android:layout_gravity="top"
android:gravity="right"
- android:background="#CC0d0d0d">
+ android:background="#4caf50"
+ android:elevation="8dp">
<ImageButton
- android:id="@+id/newtab"
- 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" />
+ android:id="@+id/newtab"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ style="@style/HoloButton"
+ android:gravity="center_vertical"
+ android:contentDescription="@string/accessibility_button_newtab"
+ android:visibility="gone"
+ android:src="@drawable/ic_new_window_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"
+ android:src="@drawable/ic_bookmarks_history_dark"
style="@style/HoloButton" />
<ImageButton
android:id="@+id/more"
@@ -59,4 +61,20 @@
android:contentDescription="@string/accessibility_button_more"
android:src="@drawable/ic_menu_overflow" />
</LinearLayout>
+ <FrameLayout
+ android:id="@+id/floating_action_button_container"
+ android:background="@drawable/fab_accent"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:layout_margin="16dp"
+ android:elevation="4dp"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content">
+ <ImageButton
+ android:id="@+id/floating_action_button"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ android:background="@drawable/floating_action_button"
+ android:src="@drawable/ic_new_window_dark"/>
+ </FrameLayout>
</RelativeLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index d1205f0c6..5b1b55c4b 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -21,7 +21,8 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/nav_tab_bg"
- android:focusable="false">
+ android:focusable="false"
+ android:elevation="6dp">
<LinearLayout
android:id="@+id/titlebar"
android:orientation="horizontal"
@@ -38,7 +39,7 @@
android:singleLine="true"
android:ellipsize="end"
android:lines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:scrollHorizontally="true"
android:drawablePadding="8dip" />
<ImageView
@@ -53,7 +54,7 @@
</LinearLayout>
<ImageView
android:id="@+id/tab_view"
- android:src="@drawable/ic_stop_holo_dark"
+ android:src="@drawable/ic_stop_dark"
android:layout_width="@dimen/nav_tab_width"
android:layout_height="@dimen/nav_tab_height"
android:paddingLeft="2dip"
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index ad9ba4b01..7db5b3871 100644
--- a/res/layout/new_folder_layout.xml
+++ b/res/layout/new_folder_layout.xml
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:src="@drawable/ic_folder_holo_dark" />
+ android:src="@drawable/ic_folder_dark" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/qc_menu_item.xml b/res/layout/qc_menu_item.xml
index 6c84aa67d..99c1eb9bb 100644
--- a/res/layout/qc_menu_item.xml
+++ b/res/layout/qc_menu_item.xml
@@ -27,4 +27,5 @@
android:paddingRight="8dip"
android:paddingTop="4dip"
android:paddingBottom="4dip"
+ android:elevation="8dp"
/>
diff --git a/res/layout/qc_tab.xml b/res/layout/qc_tab.xml
index af8d46ffa..c5e2de26a 100644
--- a/res/layout/qc_tab.xml
+++ b/res/layout/qc_tab.xml
@@ -20,6 +20,7 @@
android:orientation="vertical"
android:background="@color/black"
android:padding="0dip"
+ android:elevation="8dp"
>
<TextView android:id="@+id/title1"
android:layout_width="match_parent"
@@ -57,5 +58,6 @@
android:typeface="sans"
android:textSize="12sp"
android:textColor="#DDDDDD"
+ android:elevation="5dp"
/>
</LinearLayout>
diff --git a/res/layout/qc_tabs_view.xml b/res/layout/qc_tabs_view.xml
index accae6874..76a4ff7be 100644
--- a/res/layout/qc_tabs_view.xml
+++ b/res/layout/qc_tabs_view.xml
@@ -18,6 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="0dip"
+ android:elevation="8dp"
>
<ImageView
android:id="@+id/icon"
@@ -33,7 +34,7 @@
android:typeface="sans"
android:textSize="12sp"
android:textStyle="bold"
- android:textColor="#ffffff"
+ android:textColor="#4caF50"
android:background="@drawable/tab_nr"
/>
</RelativeLayout>
diff --git a/res/layout/tab.xml b/res/layout/tab.xml
index 040c977df..e746a99b3 100755
--- a/res/layout/tab.xml
+++ b/res/layout/tab.xml
@@ -24,7 +24,6 @@
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent">
-
<!-- Wrapper layout for the WebView, which must be in a FrameLayout. -->
<FrameLayout android:id="@+id/webview_wrapper"
android:layout_width="match_parent"
@@ -35,12 +34,14 @@
<ViewStub android:id="@+id/permissions_prompt"
android:layout="@layout/permissions_prompt"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:elevation="5dp" />
<!-- Geolocation permissions prompt -->
<ViewStub android:id="@+id/geolocation_permissions_prompt"
android:layout="@layout/geolocation_permissions_prompt"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:elevation="5dp" />
</LinearLayout>
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index a9a70fd6e..7d32a8c1e 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:orientation="horizontal"
- >
+ android:elevation="8dp">
<com.android.browser.TabScrollView
android:id="@+id/tabs"
android:layout_width="0dip"
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 8a5e308fb..3f727531c 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -15,13 +15,14 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:elevation="8dp">
<ImageView
android:id="@+id/incognito"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:src="@drawable/ic_incognito_holo_dark"
+ android:src="@drawable/ic_incognito_dark"
android:contentDescription="@string/accessibility_state_incognito"
android:visibility="gone" />
<ImageView
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index acc49e652..609fd9d90 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -18,7 +18,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/titlebar"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:elevation="8dp">
<include
layout="@layout/title_bar_nav"
android:id="@+id/taburlbar"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 2f1e0a279..5052757e0 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -17,7 +17,8 @@
<com.android.browser.NavigationBarPhone
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+ android:background="@color/primary"
+ android:elevation="8dp">
<LinearLayout
android:id="@+id/title_bg"
android:layout_width="0dip"
@@ -34,14 +35,14 @@
android:paddingLeft="4dip"
android:paddingRight="8dip"
android:visibility="gone"
- android:src="@drawable/ic_search_category_suggest" />
+ android:src="@drawable/ic_search_dark" />
<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:src="@drawable/ic_incognito_dark" />
<FrameLayout
android:id="@+id/iconcombo"
android:layout_width="44dip"
@@ -69,7 +70,7 @@
android:layout_gravity="center_vertical"
android:paddingLeft="4dip"
android:contentDescription="@string/accessibility_button_stop"
- android:src="@drawable/ic_stop_holo_dark"
+ android:src="@drawable/ic_stop_dark"
style="@style/HoloButton" />
<com.android.browser.UrlInputView
android:id="@+id/url"
@@ -88,6 +89,7 @@
android:inputType="textUri"
android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
style="@style/Suggestions"
+ android:theme="@style/Widget.UrlInputView"
android:background="@null" />
<ImageView
android:id="@+id/voice"
@@ -95,7 +97,7 @@
android:layout_height="match_parent"
android:paddingRight="4dip"
android:contentDescription="@string/accessibility_button_voice"
- android:src="@drawable/ic_voice_search_holo_dark"
+ android:src="@drawable/ic_voice_search_dark"
style="@style/HoloButton"
android:visibility="gone" />
<ImageView
@@ -104,7 +106,7 @@
android:layout_height="match_parent"
android:paddingRight="4dip"
android:contentDescription="@string/accessibility_button_clear"
- android:src="@drawable/ic_close_window_holo_dark"
+ android:src="@drawable/ic_close_window_dark"
style="@style/HoloButton"
android:visibility="gone" />
</LinearLayout>
@@ -113,7 +115,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_navscreen"
- android:src="@drawable/ic_windows_holo_dark"
+ android:src="@drawable/ic_windows_dark"
style="@style/HoloButton" />
<ImageButton
android:id="@+id/more"
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index 0e2ab1ce3..c203a808a 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -19,7 +19,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+ android:background="@color/primary"
+ android:elevation="8dp">
<ImageView
android:src="@drawable/ic_search_category_history"
android:layout_width="wrap_content"
@@ -56,7 +57,7 @@
android:id="@+id/tab_switcher"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:src="@drawable/ic_windows_holo_dark"
+ android:src="@drawable/ic_windows_dark"
android:contentDescription="@string/accessibility_button_navscreen"
style="@style/HoloButton" />
<ImageButton
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 05:24:42 +0000