Commit bd6f0233 authored by Theresa Wellington's avatar Theresa Wellington Committed by Commit Bot

Theme the system bottom navigation bar on OMR1

BUG=778736

Change-Id: I44217534a8aba3c07d113b687c4065864d6303c0
Reviewed-on: https://chromium-review.googlesource.com/806978Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521573}
parent bd278588
<?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. -->
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="MainTheme" parent="MainThemeBase" />
<style name="FullscreenWhite" parent="FullscreenWhiteBase" />
<style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" />
<style name="DialogWhenLarge" parent="DialogWhenLargeBase" />
</resources>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<style name="LauncherTheme" parent="@android:style/Theme.NoDisplay" /> <style name="LauncherTheme" parent="@android:style/Theme.NoDisplay" />
<style name="MainTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="MainThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="android:textColorHighlight">@color/text_highlight_color</item> <item name="android:textColorHighlight">@color/text_highlight_color</item>
<item name="android:textColorLink">@color/light_active_color</item> <item name="android:textColorLink">@color/light_active_color</item>
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
<item name="android:windowSharedElementEnterTransition" tools:targetApi="21">@transition/move_image</item> <item name="android:windowSharedElementEnterTransition" tools:targetApi="21">@transition/move_image</item>
<item name="android:windowSharedElementExitTransition" tools:targetApi="21">@transition/move_image</item> <item name="android:windowSharedElementExitTransition" tools:targetApi="21">@transition/move_image</item>
</style> </style>
<style name="MainTheme" parent="MainThemeBase" />
<style name="SearchActivityTheme" parent="MainTheme"> <style name="SearchActivityTheme" parent="MainTheme">
<item name="android:windowBackground">@color/google_grey_500</item> <item name="android:windowBackground">@color/google_grey_500</item>
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
<item name="android:windowBackground">@android:color/black</item> <item name="android:windowBackground">@android:color/black</item>
</style> </style>
<style name="FullscreenWhite" parent="Theme.AppCompat.Light" > <style name="FullscreenWhiteBase" parent="Theme.AppCompat.Light" >
<item name="android:windowBackground">@android:color/white</item> <item name="android:windowBackground">@android:color/white</item>
<item name="android:textColorLink">@color/light_active_color</item> <item name="android:textColorLink">@color/light_active_color</item>
<item name="colorPrimaryDark">@android:color/black</item> <item name="colorPrimaryDark">@android:color/black</item>
...@@ -81,6 +82,7 @@ ...@@ -81,6 +82,7 @@
<item name="colorAccent">@color/light_active_color</item> <item name="colorAccent">@color/light_active_color</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
<style name="FullscreenWhite" parent="FullscreenWhiteBase" />
<style name="FullscreenTransparentActivityTheme" parent="Theme.AppCompat.Light.NoActionBar" > <style name="FullscreenTransparentActivityTheme" parent="Theme.AppCompat.Light.NoActionBar" >
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
...@@ -206,7 +208,7 @@ ...@@ -206,7 +208,7 @@
<item name="android:importantForAccessibility">no</item> <item name="android:importantForAccessibility">no</item>
</style> </style>
<style name="ThemeWithActionBar" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="ThemeWithActionBarBase" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowBackground">@drawable/action_bar_activity_bg</item> <item name="android:windowBackground">@drawable/action_bar_activity_bg</item>
<!-- Action bar color --> <!-- Action bar color -->
<item name="colorPrimary">@color/dark_action_bar_color</item> <item name="colorPrimary">@color/dark_action_bar_color</item>
...@@ -215,6 +217,7 @@ ...@@ -215,6 +217,7 @@
<!-- Color of checkboxes, switches, buttons, etc. --> <!-- Color of checkboxes, switches, buttons, etc. -->
<item name="colorAccent">@color/pref_accent_color</item> <item name="colorAccent">@color/pref_accent_color</item>
</style> </style>
<style name="ThemeWithActionBar" parent="ThemeWithActionBarBase" />
<style name="FlushFooterButton"> <style name="FlushFooterButton">
<item name="android:textColor">@color/light_normal_color</item> <item name="android:textColor">@color/light_normal_color</item>
...@@ -467,7 +470,7 @@ ...@@ -467,7 +470,7 @@
</style> </style>
<!-- First Run and Bookmark/recent-tabs dialogs --> <!-- First Run and Bookmark/recent-tabs dialogs -->
<style name="DialogWhenLarge" parent="Theme.AppCompat.Light.DialogWhenLarge" > <style name="DialogWhenLargeBase" parent="Theme.AppCompat.Light.DialogWhenLarge" >
<item name="android:windowBackground">@drawable/bg_white_dialog</item> <item name="android:windowBackground">@drawable/bg_white_dialog</item>
<item name="android:textColor">@color/default_text_color</item> <item name="android:textColor">@color/default_text_color</item>
<item name="android:textColorLink">@color/light_active_color</item> <item name="android:textColorLink">@color/light_active_color</item>
...@@ -478,6 +481,7 @@ ...@@ -478,6 +481,7 @@
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
</style> </style>
<style name="DialogWhenLarge" parent="DialogWhenLargeBase" />
<style name="SigninAlertDialogTheme" parent="AlertDialogTheme"> <style name="SigninAlertDialogTheme" parent="AlertDialogTheme">
<item name="buttonBarButtonStyle">@style/SigninDialogButtonStyle</item> <item name="buttonBarButtonStyle">@style/SigninDialogButtonStyle</item>
...@@ -531,19 +535,6 @@ ...@@ -531,19 +535,6 @@
<item name="android:textAppearance">@style/BlackBody</item> <item name="android:textAppearance">@style/BlackBody</item>
</style> </style>
<!-- Physical Web styles -->
<style name="PhysicalWebNearbyUrlsListStyle" parent="Theme.AppCompat.Light">
<item name="android:windowBackground">@android:color/white</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="PhysicalWebOptInStyle" parent="Theme.AppCompat.Light">
<item name="android:windowBackground">@android:color/white</item>
<item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<!-- Payments UI --> <!-- Payments UI -->
<style name="PaymentsUiSectionHeader"> <style name="PaymentsUiSectionHeader">
<item name="android:textColor">@color/google_blue_700</item> <item name="android:textColor">@color/google_blue_700</item>
......
<?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. -->
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="MainTheme" parent="MainThemeBase">
<item name="android:navigationBarColor">@color/bottom_system_nav_color</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="FullscreenWhite" parent="FullscreenWhiteBase">
<item name="android:navigationBarColor">@color/bottom_system_nav_color</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="ThemeWithActionBar" parent="ThemeWithActionBarBase">
<item name="android:navigationBarColor">@color/bottom_system_nav_color</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="DialogWhenLarge" parent="DialogWhenLargeBase">
<item name="android:navigationBarColor">@color/bottom_system_nav_color</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
</resources>
...@@ -206,5 +206,6 @@ ...@@ -206,5 +206,6 @@
<color name="modern_toolbar_bg">@color/white_alpha_90</color> <color name="modern_toolbar_bg">@color/white_alpha_90</color>
<color name="google_blue_500_alpha_38_opaque">#B7D1FB</color> <color name="google_blue_500_alpha_38_opaque">#B7D1FB</color>
<color name="toolbar_shadow_color">@color/black_alpha_11</color> <color name="toolbar_shadow_color">@color/black_alpha_11</color>
<color name="bottom_system_nav_color">@android:color/white</color>
</resources> </resources>
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package org.chromium.chrome.browser; package org.chromium.chrome.browser;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.WindowManager; import android.view.WindowManager;
...@@ -25,7 +26,10 @@ public abstract class SnackbarActivity extends SynchronousInitializationActivity ...@@ -25,7 +26,10 @@ public abstract class SnackbarActivity extends SynchronousInitializationActivity
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
}
mSnackbarManager = new SnackbarManager(this, null); mSnackbarManager = new SnackbarManager(this, null);
} }
......
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