From 6073f3c58b4b7585bc446c49cb1fa86f438d307c Mon Sep 17 00:00:00 2001
From: kwaky <kwaky@google.com>
Date: Thu, 6 Feb 2020 13:45:57 -0800
Subject: [PATCH] DO NOT MERGE Adjust NotificationView bottom margin based on
 whether Keyboard is shown.

If the Keyboard is shown, then margin bottom is 0.
Otherwise, the margin is the height of the NavBar.

Bug: 149022190
Test: Manual. Verify that NotificationView's margin adjusts based on
whether keyboard or IME is shown.

Change-Id: I96c50a4d773dfac9b57ab1c15cfc59d315da4605
---
 .../res/layout/notification_center_activity.xml           | 3 ++-
 .../com/android/systemui/statusbar/car/CarStatusBar.java  | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/CarSystemUI/res/layout/notification_center_activity.xml b/packages/CarSystemUI/res/layout/notification_center_activity.xml
index 0af74c4462a67..e5cc08a3b601d 100644
--- a/packages/CarSystemUI/res/layout/notification_center_activity.xml
+++ b/packages/CarSystemUI/res/layout/notification_center_activity.xml
@@ -20,7 +20,8 @@
     android:id="@+id/notification_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/notification_shade_background_color">
+    android:background="@color/notification_shade_background_color"
+    android:visibility="invisible">
 
     <View
         android:id="@+id/glass_pane"
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index 0a2d5a08a9141..e0f398742ebca 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -1092,6 +1092,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
         }
 
         mNavigationBarWindow.setVisibility(isKeyboardVisible ? View.GONE : View.VISIBLE);
+        setNotificationViewBottomMargin(isKeyboardVisible ? 0 : mNavigationBarWindow.getHeight());
         mBottomNavBarVisible = !isKeyboardVisible;
     }
 
@@ -1155,6 +1156,13 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
         addTemperatureViewToController(mRightNavigationBarView);
     }
 
+    private void setNotificationViewBottomMargin(int bottomMargin) {
+        ViewGroup.MarginLayoutParams params =
+                (ViewGroup.MarginLayoutParams) mNotificationView.getLayoutParams();
+        params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, bottomMargin);
+        mNotificationView.setLayoutParams(params);
+    }
+
     @Override
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         //When executing dump() function simultaneously, we need to serialize them