summaryrefslogtreecommitdiff
path: root/chromium/weblayer/public/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/weblayer/public/java/res')
-rw-r--r--chromium/weblayer/public/java/res/values-night/colors.xml10
-rw-r--r--chromium/weblayer/public/java/res/values-night/values.xml10
-rw-r--r--chromium/weblayer/public/java/res/values-v27/styles.xml12
-rw-r--r--chromium/weblayer/public/java/res/values-v28/styles.xml18
-rw-r--r--chromium/weblayer/public/java/res/values/colors.xml16
-rw-r--r--chromium/weblayer/public/java/res/values/ids.xml8
-rw-r--r--chromium/weblayer/public/java/res/values/styles.xml13
-rw-r--r--chromium/weblayer/public/java/res/values/values.xml10
8 files changed, 89 insertions, 8 deletions
diff --git a/chromium/weblayer/public/java/res/values-night/colors.xml b/chromium/weblayer/public/java/res/values-night/colors.xml
new file mode 100644
index 00000000000..3846e456aee
--- /dev/null
+++ b/chromium/weblayer/public/java/res/values-night/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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>
+ <color name="weblayer_default_bg_color">@color/weblayer_default_bg_color_dark</color>
+ <color name="weblayer_bottom_system_nav_color">@android:color/black</color>
+ <color name="weblayer_bottom_system_nav_divider_color">@android:color/black</color>
+</resources>
diff --git a/chromium/weblayer/public/java/res/values-night/values.xml b/chromium/weblayer/public/java/res/values-night/values.xml
new file mode 100644
index 00000000000..5009ad51a2a
--- /dev/null
+++ b/chromium/weblayer/public/java/res/values-night/values.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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">
+ <!-- Status and navigation bar icon styling. -->
+ <bool name="weblayer_window_light_status_bar">false</bool>
+ <bool name="weblayer_window_light_navigation_bar">false</bool>
+</resources>
diff --git a/chromium/weblayer/public/java/res/values-v27/styles.xml b/chromium/weblayer/public/java/res/values-v27/styles.xml
new file mode 100644
index 00000000000..0ffe78b5f62
--- /dev/null
+++ b/chromium/weblayer/public/java/res/values-v27/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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>
+ <style name="Theme.WebLayer.SiteSettings" parent="Base.Theme.WebLayer.SiteSettings">
+ <item name="android:navigationBarColor">@color/weblayer_bottom_system_nav_color</item>
+ <item name="android:navigationBarDividerColor">@color/weblayer_bottom_system_nav_divider_color</item>
+ <item name="android:windowLightNavigationBar">@bool/weblayer_window_light_navigation_bar</item>
+ </style>
+</resources>
diff --git a/chromium/weblayer/public/java/res/values-v28/styles.xml b/chromium/weblayer/public/java/res/values-v28/styles.xml
new file mode 100644
index 00000000000..0a21de0a4eb
--- /dev/null
+++ b/chromium/weblayer/public/java/res/values-v28/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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>
+ <style name="Theme.WebLayer.SiteSettings" parent="Base.Theme.WebLayer.SiteSettings">
+ <item name="android:navigationBarColor">@color/weblayer_bottom_system_nav_color</item>
+ <item name="android:navigationBarDividerColor">@color/weblayer_bottom_system_nav_divider_color</item>
+ <item name="android:windowLightNavigationBar">@bool/weblayer_window_light_navigation_bar</item>
+
+ <!-- The windowLightStatusBar attribute was added in API 23, but we
+ avoid using it via XML prior to 28 due to: https://crbug.com/884144
+ and https://crbug.com/1014844 -->
+ <item name="android:statusBarColor">@color/weblayer_default_bg_color</item>
+ <item name="android:windowLightStatusBar">@bool/weblayer_window_light_status_bar</item>
+ </style>
+</resources>
diff --git a/chromium/weblayer/public/java/res/values/colors.xml b/chromium/weblayer/public/java/res/values/colors.xml
new file mode 100644
index 00000000000..bb86aec4897
--- /dev/null
+++ b/chromium/weblayer/public/java/res/values/colors.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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" tools:ignore="UnusedResources">
+ <color name="weblayer_default_bg_color">@color/weblayer_default_bg_color_light</color>
+ <color name="weblayer_default_bg_color_light">@android:color/white</color>
+ <color name="weblayer_default_bg_color_dark">@color/weblayer_modern_grey_900</color>
+
+ <color name="weblayer_bottom_system_nav_color">@android:color/white</color>
+ <color name="weblayer_bottom_system_nav_divider_color">@color/weblayer_black_alpha_12</color>
+
+ <color name="weblayer_black_alpha_12">#1F000000</color>
+ <color name="weblayer_modern_grey_900">#202124</color>
+</resources>
diff --git a/chromium/weblayer/public/java/res/values/ids.xml b/chromium/weblayer/public/java/res/values/ids.xml
new file mode 100644
index 00000000000..300c7e62a50
--- /dev/null
+++ b/chromium/weblayer/public/java/res/values/ids.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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>
+ <item type="id" name="weblayer_media_session_notification" />
+</resources>
diff --git a/chromium/weblayer/public/java/res/values/styles.xml b/chromium/weblayer/public/java/res/values/styles.xml
index 478e0f2bbcd..143124cc560 100644
--- a/chromium/weblayer/public/java/res/values/styles.xml
+++ b/chromium/weblayer/public/java/res/values/styles.xml
@@ -4,21 +4,18 @@
found in the LICENSE file. -->
<resources xmlns:tools="http://schemas.android.com/tools">
- <style name="Theme.WebLayer" parent="Theme.BrowserUI">
+ <style name="Base.Theme.WebLayer.SiteSettings" parent="Theme.AppCompat.DayNight">
<!-- Window Properties -->
- <item name="android:windowBackground">@color/default_bg_color</item>
+ <item name="android:windowBackground">@color/weblayer_default_bg_color</item>
<!-- Action bar color -->
- <item name="colorPrimary">@color/default_bg_color</item>
+ <item name="colorPrimary">@color/weblayer_default_bg_color</item>
<!-- Status bar color -->
+ <item name="colorPrimaryDark">@android:color/black</item>
<item name="android:statusBarColor" tools:targetApi="21">@android:color/black</item>
<item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
- <item name="colorPrimaryDark">@android:color/black</item>
</style>
- <style name="Theme.WebLayer.SiteSettings">
- <item name="windowActionBar">true</item>
- <item name="windowNoTitle">false</item>
- </style>
+ <style name="Theme.WebLayer.SiteSettings" parent="Base.Theme.WebLayer.SiteSettings" />
</resources>
diff --git a/chromium/weblayer/public/java/res/values/values.xml b/chromium/weblayer/public/java/res/values/values.xml
new file mode 100644
index 00000000000..a04c1d9a0ea
--- /dev/null
+++ b/chromium/weblayer/public/java/res/values/values.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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">
+ <!-- Status and navigation bar icon styling. -->
+ <bool name="weblayer_window_light_status_bar">true</bool>
+ <bool name="weblayer_window_light_navigation_bar">true</bool>
+</resources>