Commit 4a6d0cb5 authored by Theresa's avatar Theresa Committed by Commit Bot

[Android] Update bottom system navigation colors

BUG=953462

Change-Id: I937076dbdf0fc97da644bf73aaf3e79678bf215b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1570588Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652579}
parent aadaf277
<?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. -->
<resources>
<color name="bottom_system_nav_color">@android:color/black</color>
<color name="bottom_system_nav_divider_color">@android:color/black</color>
</resources>
<?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. -->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Bottom navigation bar styling. -->
<bool name="window_light_navigation_bar">false</bool>
</resources>
......@@ -15,6 +15,7 @@ import android.view.ViewGroup;
import android.view.Window;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.BuildInfo;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver;
......@@ -85,7 +86,7 @@ class NavigationBarColorController implements VrModeObserver {
// If we're not using a light navigation bar, it will always be black so there's no need
// to register observers and manipulate coloring.
if (!mResources.getBoolean(R.bool.window_light_navigation_bar)) {
if (!mResources.getBoolean(R.bool.window_light_navigation_bar) || BuildInfo.isAtLeastQ()) {
mTabModelSelector = null;
mTabModelSelectorObserver = null;
mOverviewModeBehavior = null;
......@@ -129,7 +130,7 @@ class NavigationBarColorController implements VrModeObserver {
*/
public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) {
// TODO(https://crbug.com/937946): Adjust after immersive mode manager is hooked up.
if (!mResources.getBoolean(R.bool.window_light_navigation_bar)
if (!mResources.getBoolean(R.bool.window_light_navigation_bar) || BuildInfo.isAtLeastQ()
|| (mImmersiveModeManager != null
&& mImmersiveModeManager.isImmersiveModeSupported())) {
return;
......
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