From 0df12a588d0fcd66f971f9b288dea3dca4bd0076 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Fri, 10 May 2019 18:26:44 -0700
Subject: [PATCH] For #1876 - Correct Navigation Bar Color Logic (#2427)

---
 app/src/main/java/org/mozilla/fenix/ThemeManager.kt | 6 +-----
 app/src/main/res/values-v23/styles.xml              | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt
index 00098e15e..18ef11b22 100644
--- a/app/src/main/java/org/mozilla/fenix/ThemeManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/ThemeManager.kt
@@ -105,17 +105,13 @@ class DefaultThemeManager : ThemeManager {
             window: Window,
             context: Context
         ) {
-            if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.O) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
                 // API level can display handle light navigation bar color
                 window.decorView.systemUiVisibility =
                     window.decorView.systemUiVisibility or
                             View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or
                             View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
                 updateNavigationBar(window, context)
-            } else {
-                window.decorView.systemUiVisibility =
-                    window.decorView.systemUiVisibility or
-                            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
             }
         }
 
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 44a3beca2..0be0842f8 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">?foundation</item>
     </style>
 
     <style name="PrivateTheme" parent="PrivateThemeBase">