summaryrefslogtreecommitdiff
path: root/chromium/weblayer/browser/java/res
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/weblayer/browser/java/res
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/weblayer/browser/java/res')
-rw-r--r--chromium/weblayer/browser/java/res/drawable/weblayer_infobar_wrapper_bg.xml16
-rw-r--r--chromium/weblayer/browser/java/res/drawable/weblayer_tab_indicator.xml15
-rw-r--r--chromium/weblayer/browser/java/res/layout/site_settings_layout.xml13
-rw-r--r--chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_compact_content.xml39
-rw-r--r--chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_tab_content.xml28
-rw-r--r--chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item.xml21
-rw-r--r--chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item_checked.xml48
-rw-r--r--chromium/weblayer/browser/java/res/layout/weblayer_url_bar.xml2
-rw-r--r--chromium/weblayer/browser/java/res/values/colors.xml11
-rw-r--r--chromium/weblayer/browser/java/res/values/dimens.xml11
-rw-r--r--chromium/weblayer/browser/java/res/values/styles.xml43
11 files changed, 206 insertions, 41 deletions
diff --git a/chromium/weblayer/browser/java/res/drawable/weblayer_infobar_wrapper_bg.xml b/chromium/weblayer/browser/java/res/drawable/weblayer_infobar_wrapper_bg.xml
new file mode 100644
index 00000000000..e119c1148fa
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/drawable/weblayer_infobar_wrapper_bg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item>
+ <bitmap
+ android:src="@drawable/infobar_shadow_top"
+ android:gravity="top|fill_horizontal"
+ android:tileMode="disabled" />
+ </item>
+ <item
+ android:top="@dimen/infobar_shadow_height"
+ android:drawable="@color/infobar_background_color" />
+</layer-list>
diff --git a/chromium/weblayer/browser/java/res/drawable/weblayer_tab_indicator.xml b/chromium/weblayer/browser/java/res/drawable/weblayer_tab_indicator.xml
new file mode 100644
index 00000000000..c8ab7e06481
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/drawable/weblayer_tab_indicator.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:left="@dimen/weblayer_tab_indicator_padding"
+ android:right="@dimen/weblayer_tab_indicator_padding" >
+ <shape android:shape="rectangle" >
+ <corners
+ android:topRightRadius="@dimen/weblayer_tab_indicator_radius"
+ android:topLeftRadius="@dimen/weblayer_tab_indicator_radius" />
+ </shape>
+ </item>
+</layer-list>
diff --git a/chromium/weblayer/browser/java/res/layout/site_settings_layout.xml b/chromium/weblayer/browser/java/res/layout/site_settings_layout.xml
index 7bb3c0b82f1..c9cf58e79f1 100644
--- a/chromium/weblayer/browser/java/res/layout/site_settings_layout.xml
+++ b/chromium/weblayer/browser/java/res/layout/site_settings_layout.xml
@@ -3,9 +3,14 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
-<FrameLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/site_settings_container">
-</FrameLayout>
+ android:layout_height="match_parent">
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/site_settings_container">
+ </FrameLayout>
+ <include layout="@layout/settings_action_bar_shadow" />
+</RelativeLayout>
diff --git a/chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_compact_content.xml b/chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_compact_content.xml
new file mode 100644
index 00000000000..82149b5b142
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_compact_content.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/weblayer_translate_infobar_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+ <!-- TODO(huayinz): Change app:tabIndicatorColor to some common color reference -->
+ <org.chromium.weblayer_private.TranslateTabLayout
+ android:id="@+id/weblayer_translate_infobar_tabs"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:requiresFadingEdge="horizontal"
+ android:fadingEdgeLength="@dimen/weblayer_infobar_translate_fade_edge_length"
+ app:tabIndicator="@drawable/weblayer_tab_indicator"
+ app:tabIndicatorFullWidth="false"
+ app:tabIndicatorHeight="3dp"
+ app:tabSelectedTextColor="@color/weblayer_tab_layout_selected_tab_color"
+ app:tabGravity="fill"
+ app:tabMode="scrollable" />
+
+ <org.chromium.ui.widget.ChromeImageButton
+ android:id="@+id/weblayer_translate_infobar_menu_button"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:minHeight="@dimen/min_touch_target_size"
+ android:minWidth="@dimen/min_touch_target_size"
+ android:scaleType="center"
+ android:background="?attr/selectableItemBackground"
+ android:contentDescription="@string/accessibility_toolbar_btn_menu"
+ android:src="@drawable/ic_more_vert_24dp"
+ app:tint="@color/default_icon_color_tint_list" />
+</LinearLayout>
diff --git a/chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_tab_content.xml b/chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_tab_content.xml
new file mode 100644
index 00000000000..3be8f467c43
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/layout/weblayer_infobar_translate_tab_content.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<org.chromium.weblayer_private.TranslateTabContent
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/weblayer_translate_tabcontent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <!-- Add both the textView and progressBar to the tab, and only keep one of them visible.
+ This way the width of the Tab will always be fixed no matter which one is visible. -->
+ <TextView
+ android:id="@+id/weblayer_translate_infobar_tab_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:textAppearance="@style/TextAppearance.Design.Tab"
+ android:visibility="visible"
+ android:singleLine="true" />
+ <ProgressBar
+ android:id="@+id/weblayer_translate_infobar_tab_progressbar"
+ android:layout_width="@dimen/infobar_small_icon_size"
+ android:layout_height="@dimen/infobar_small_icon_size"
+ android:layout_gravity="center"
+ android:indeterminate="true"
+ android:visibility="invisible" />
+</org.chromium.weblayer_private.TranslateTabContent>
diff --git a/chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item.xml b/chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item.xml
new file mode 100644
index 00000000000..a7948450da3
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/WebLayerAppMenuItem"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ android:id="@+id/weblayer_menu_item_text"
+ android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:gravity="center_vertical"
+ android:paddingTop="13dp"
+ android:paddingBottom="13dp" />
+
+</FrameLayout>
diff --git a/chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item_checked.xml b/chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item_checked.xml
new file mode 100644
index 00000000000..a4bd2cf4692
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/layout/weblayer_translate_menu_item_checked.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ style="@style/WebLayerAppMenuItem"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <TextView
+ android:id="@+id/weblayer_menu_item_text"
+ android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_gravity="start"
+ android:gravity="center_vertical"
+ android:paddingTop="13dp"
+ android:paddingBottom="13dp"
+ android:paddingEnd="16dp" />
+ <org.chromium.ui.widget.ChromeImageView
+ android:id="@+id/weblayer_menu_item_icon"
+ android:src="@drawable/ic_check_googblue_24dp"
+ android:layout_width="24dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="end"
+ android:gravity="center_vertical"
+ app:tint="@color/default_icon_color_tint_list" />
+
+ </LinearLayout>
+
+ <View
+ android:id="@+id/weblayer_menu_item_divider"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/divider_line_bg_color"
+ android:visibility="gone" />
+
+</LinearLayout>
+
diff --git a/chromium/weblayer/browser/java/res/layout/weblayer_url_bar.xml b/chromium/weblayer/browser/java/res/layout/weblayer_url_bar.xml
index 1e8828d7f25..e5f2b57b80e 100644
--- a/chromium/weblayer/browser/java/res/layout/weblayer_url_bar.xml
+++ b/chromium/weblayer/browser/java/res/layout/weblayer_url_bar.xml
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
- android:maxLines="1"
+ android:singleLine="true"
android:paddingEnd="@dimen/url_text_edge_padding"
android:paddingStart="@dimen/url_text_edge_padding"
android:ellipsize="start"
diff --git a/chromium/weblayer/browser/java/res/values/colors.xml b/chromium/weblayer/browser/java/res/values/colors.xml
new file mode 100644
index 00000000000..bb00b313960
--- /dev/null
+++ b/chromium/weblayer/browser/java/res/values/colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+ <!-- Please see src/ui/android/java/res/values/colors.xml for the shared common colors. -->
+
+ <color name="weblayer_tab_layout_selected_tab_color">@color/default_text_color_blue</color>
+
+</resources>
diff --git a/chromium/weblayer/browser/java/res/values/dimens.xml b/chromium/weblayer/browser/java/res/values/dimens.xml
index dfce8d8e51e..0eee3fc9758 100644
--- a/chromium/weblayer/browser/java/res/values/dimens.xml
+++ b/chromium/weblayer/browser/java/res/values/dimens.xml
@@ -6,4 +6,13 @@
<resources>
<dimen name="security_status_icon_size">18dp</dimen>
<dimen name="url_text_edge_padding">5dp</dimen>
-</resources> \ No newline at end of file
+
+ <!-- Dimensions for compact translate infobar. -->
+ <dimen name="weblayer_infobar_translate_fade_edge_length">18dp</dimen>
+ <dimen name="weblayer_infobar_translate_menu_width">260dp</dimen>
+
+ <!-- Dimens of tab indicator -->
+ <dimen name="weblayer_tab_indicator_radius">3dp</dimen>
+ <dimen name="weblayer_tab_indicator_padding">2dp</dimen>
+
+</resources>
diff --git a/chromium/weblayer/browser/java/res/values/styles.xml b/chromium/weblayer/browser/java/res/values/styles.xml
index b90beb2e45c..f362fd9ab69 100644
--- a/chromium/weblayer/browser/java/res/values/styles.xml
+++ b/chromium/weblayer/browser/java/res/values/styles.xml
@@ -10,40 +10,13 @@
<item name="alertDialogTheme">@style/Theme.Chromium.AlertDialog</item>
</style>
- <style name="PreferenceTheme">
- <item name="preferenceStyle">@style/PreferenceItem</item>
- <item name="preferenceFragmentCompatStyle">@style/SettingsFragment</item>
- <item name="preferenceFragmentListStyle">@style/SettingsFragmentList</item>
- <item name="dialogPreferenceStyle">@style/DialogPreference</item>
- <item name="checkBoxPreferenceStyle">@style/CheckBoxPreference</item>
- <item name="switchPreferenceCompatStyle">@style/SwitchPreference</item>
- </style>
-
- <style name="PreferenceItem">
- <item name="android:layout">@layout/preference_compat</item>
- </style>
-
- <style name="SettingsFragment">
- <item name="android:divider">?android:attr/listDivider</item>
- </style>
-
- <style name="SettingsFragmentList">
- <item name="android:paddingStart">0dp</item>
- <item name="android:paddingEnd">0dp</item>
- </style>
-
- <style name="DialogPreference">
- <item name="android:layout">@layout/preference_compat</item>
- <item name="android:negativeButtonText">@android:string/cancel</item>
- </style>
-
- <style name="CheckBoxPreference">
- <item name="android:layout">@layout/preference_compat</item>
- <item name="android:widgetLayout">@layout/preference_widget_checkbox</item>
- </style>
-
- <style name="SwitchPreference">
- <item name="android:layout">@layout/preference_compat</item>
- <item name="android:widgetLayout">@layout/preference_widget_switch_compat</item>
+ <!-- The following styles may be used to style views provided by a CustomViewBinder or attached
+ to the app menu as headers or footers. -->
+
+ <!-- Styling for an app menu item row. -->
+ <style name="WebLayerAppMenuItem">
+ <item name="android:paddingStart">16dp</item>
+ <item name="android:paddingEnd">16dp</item>
+ <item name="android:background">?attr/listChoiceBackgroundIndicator</item>
</style>
</resources>