Commit 295a4f32 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot

[WebLayer] Remove //components/browser_ui/styles dependency from WebLayer client library

This will reduce the amount of code embedders need to pull in in order
to compile the client library.

Bug: 1085553
Change-Id: I1c69c123ec47fd94ef100c7c35f7f150f31055c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2223016
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773946}
parent 9151242d
......@@ -19,10 +19,15 @@ jinja_template("weblayer_client_manifest") {
android_resources("client_resources") {
sources = [
"res/values-night/colors.xml",
"res/values-night/values.xml",
"res/values-v27/styles.xml",
"res/values-v28/styles.xml",
"res/values/colors.xml",
"res/values/styles.xml",
"res/values/values.xml",
"res/xml/weblayer_file_paths.xml",
]
deps = [ "//components/browser_ui/styles/android:java_resources" ]
android_manifest = weblayer_client_manifest
android_manifest_dep = ":weblayer_client_manifest"
}
......
<?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>
<?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>
<?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>
<?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>
<?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>
......@@ -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>
<?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>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment