From fd44ddf2787aa327c51411c0807e2b492f7c9daf Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 3 Apr 2019 14:56:16 -0700
Subject: [PATCH] For #1144 - Use System Black Navigation Bar for <API27 +
 Light Theme

---
 .../java/org/mozilla/fenix/ThemeManager.kt    | 43 +++++++++++++------
 app/src/main/res/values-v23/styles.xml        |  3 --
 app/src/main/res/values-v27/styles.xml        |  1 +
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt
index 252fa6c88..702abddfc 100644
--- a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt
@@ -64,18 +64,10 @@ class DefaultThemeManager : ThemeManager {
             onHomeScreen: Boolean = true
         ) {
             window.statusBarColor = ContextCompat
-                .getColor(context, DefaultThemeManager
-                    .resolveAttribute(android.R.attr.statusBarColor, context))
-
-            if (onHomeScreen) {
-                window.navigationBarColor = ContextCompat
-                    .getColor(context, DefaultThemeManager
-                        .resolveAttribute(R.attr.navigationBarColorHome, context))
-            } else {
-                window.navigationBarColor = ContextCompat
-                    .getColor(context, DefaultThemeManager
-                        .resolveAttribute(R.attr.navigationBarColorBrowser, context))
-            }
+                .getColor(
+                    context, DefaultThemeManager
+                        .resolveAttribute(android.R.attr.statusBarColor, context)
+                )
 
             when (themeManager.currentTheme) {
                 ThemeManager.Theme.Normal -> {
@@ -87,18 +79,28 @@ class DefaultThemeManager : ThemeManager {
                                 window.decorView.systemUiVisibility or
                                         View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or
                                         View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                            if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.O) {
+                                // API level can display handle light navigation bar color
+                                updateNavigationBar(onHomeScreen, window, context)
+                            }
                         }
                         Configuration.UI_MODE_NIGHT_YES -> {
                             window.decorView.systemUiVisibility =
                                 window.decorView.systemUiVisibility and
                                         View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() and
                                         View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
+                            updateNavigationBar(onHomeScreen, window, context)
                         }
                         Configuration.UI_MODE_NIGHT_UNDEFINED -> {
+                            // We assume light here per Android doc's recommendation
                             window.decorView.systemUiVisibility =
                                 window.decorView.systemUiVisibility or
                                         View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or
                                         View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                            if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.O) {
+                                // API level can display handle light navigation bar color
+                                updateNavigationBar(onHomeScreen, window, context)
+                            }
                         }
                     }
                 }
@@ -106,8 +108,25 @@ class DefaultThemeManager : ThemeManager {
                     window.decorView.systemUiVisibility = window.decorView.systemUiVisibility and
                             View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() and
                             View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
+                    updateNavigationBar(onHomeScreen, window, context)
                 }
             }
         }
+
+        private fun updateNavigationBar(onHomeScreen: Boolean, window: Window, context: Context) {
+            if (onHomeScreen) {
+                window.navigationBarColor = ContextCompat
+                    .getColor(
+                        context, DefaultThemeManager
+                            .resolveAttribute(R.attr.navigationBarColorHome, context)
+                    )
+            } else {
+                window.navigationBarColor = ContextCompat
+                    .getColor(
+                        context, DefaultThemeManager
+                            .resolveAttribute(R.attr.navigationBarColorBrowser, context)
+                    )
+            }
+        }
     }
 }
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index a7600cd56..2391968ad 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -9,9 +9,6 @@
             sure we also get them in 27+ -->
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">@bool/theme_is_light</item>
-
-        <!-- Style the navigation bar -->
-        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="PrivateTheme" parent="PrivateThemeBase">
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 26fe58630..c01489947 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -23,6 +23,7 @@
         <item name="android:windowLightStatusBar">@bool/theme_is_light</item>
 
         <!-- Style the navigation bar -->
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:navigationBarDividerColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
     </style>