From 43955abb2fd9648febbdf941ff4b3a5daa376bbf Mon Sep 17 00:00:00 2001
From: Amir Zaidi <azaidi@live.nl>
Date: Mon, 19 Feb 2018 11:29:33 +0100
Subject: [PATCH] Add navigation bar background for pre-Oreo bottom sheet

---
 res/layout/app_edit_bottom_sheet.xml                     | 8 ++++++++
 res/layout/widgets_bottom_sheet.xml                      | 8 ++++++++
 res/values-v21/styles.xml                                | 3 ---
 res/values-v26/styles.xml                                | 2 ++
 res/values/attrs.xml                                     | 3 +++
 res/values/styles.xml                                    | 6 +++++-
 src/com/android/launcher3/widget/WidgetsBottomSheet.java | 9 +++++++++
 7 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/res/layout/app_edit_bottom_sheet.xml b/res/layout/app_edit_bottom_sheet.xml
index a330f4e4fc..37f39ea824 100644
--- a/res/layout/app_edit_bottom_sheet.xml
+++ b/res/layout/app_edit_bottom_sheet.xml
@@ -52,4 +52,12 @@
         android:layout_marginTop="32dp"
         android:layout_marginBottom="40dp" />
 
+    <View
+        android:id="@+id/nav_bar_bg"
+        android:background="?attr/bottomSheetNavBarColor"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:focusable="false"  />
+
 </com.google.android.apps.nexuslauncher.CustomBottomSheet>
\ No newline at end of file
diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index e8c6961f43..3059685a62 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -51,4 +51,12 @@
          android:layout_marginTop="45dp"
          android:layout_marginBottom="40dp"/>
 
+    <View
+        android:id="@+id/nav_bar_bg"
+        android:background="?attr/bottomSheetNavBarColor"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="bottom"
+        android:focusable="false"  />
+
 </com.android.launcher3.widget.WidgetsBottomSheet>
\ No newline at end of file
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 4bc92a42c8..927719cc1a 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -25,7 +25,4 @@
         <item name="android:statusBarColor">#00000000</item>
         <item name="android:navigationBarColor">#00000000</item>
     </style>
-    <style name="WidgetContainerTheme.Dark" parent="LauncherThemeDark">
-        <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
-    </style>
 </resources>
diff --git a/res/values-v26/styles.xml b/res/values-v26/styles.xml
index 85c48b033b..33d0309b8c 100644
--- a/res/values-v26/styles.xml
+++ b/res/values-v26/styles.xml
@@ -21,10 +21,12 @@
     <style name="WidgetContainerTheme" parent="@android:style/Theme.Material.Settings">
         <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
         <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="bottomSheetNavBarColor">#00000000</item>
     </style>
     <style name="WidgetContainerTheme.Dark" parent="LauncherThemeDark">
         <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
         <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
+        <item name="bottomSheetNavBarColor">#00000000</item>
     </style>
 
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7fcdd5b32d..9df29723d3 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -148,4 +148,7 @@
     <!-- Pixel -->
     <attr name="gIcon" format="reference" />
     <attr name="micIcon" format="reference" />
+
+    <!-- Custom -->
+    <attr name="bottomSheetNavBarColor" format="color" />
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 536a52d6a8..f127ee35e2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -88,6 +88,7 @@
         <item name="android:colorEdgeEffect">?android:attr/textColorSecondaryInverse</item>
         <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item>
         <item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>
+        <item name="bottomSheetNavBarColor">@color/all_apps_navbar_color</item>
 
         <!-- Backports -->
         <item name="android:textColorPrimaryInverse">@color/textColorPrimaryInverse</item>
@@ -97,7 +98,10 @@
         <item name="android:colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="WidgetContainerTheme.Dark" />
+    <style name="WidgetContainerTheme.Dark" parent="LauncherThemeDark">
+        <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
+        <item name="bottomSheetNavBarColor">#00000000</item>
+    </style>
 
     <style name="FastScrollerPopup" >
         <item name="android:layout_width">wrap_content</item>
diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 01101ac74c..eb2a7c7fb2 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -260,6 +260,15 @@ public class WidgetsBottomSheet extends AbstractFloatingView implements Insettab
         int rightInset = insets.right - mInsets.right;
         int bottomInset = insets.bottom - mInsets.bottom;
         mInsets.set(insets);
+
+        if (!Utilities.ATLEAST_OREO && !mLauncher.getDeviceProfile().isVerticalBarLayout()) {
+            View navBarBg = findViewById(R.id.nav_bar_bg);
+            ViewGroup.LayoutParams navBarBgLp = navBarBg.getLayoutParams();
+            navBarBgLp.height = bottomInset;
+            navBarBg.setLayoutParams(navBarBgLp);
+            bottomInset = 0;
+        }
+
         setPadding(getPaddingLeft() + leftInset, getPaddingTop(),
                 getPaddingRight() + rightInset, getPaddingBottom() + bottomInset);
     }