From 05649fcf17bbbfee83364a67e84cd15dff96e9bd Mon Sep 17 00:00:00 2001
From: JianYang Liu <jianyliu@google.com>
Date: Fri, 6 Mar 2020 14:04:37 -0800
Subject: [PATCH] Updated Fullscreen user switcher to not use
 fitsSystemWindows.

fitsSystemWindows="true" has default behavior of setting padding of the
view to ensure contents don't overlay system windows. In the case of the
fullscreen user switcher, we don't need this behavior.

Bug: 150302361
Test: Manual (set lockscreen, restart, click "Cancel")
Change-Id: Ifc597c2b96862abc3283d6af1a0c2765431c71af
---
 .../res/layout/car_fullscreen_user_switcher.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml b/packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml
index 55207b335aed1..6ecab5182f134 100644
--- a/packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml
+++ b/packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml
@@ -18,8 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fullscreen_user_switcher"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/container"
@@ -28,11 +27,10 @@
         android:layout_alignParentTop="true"
         android:orientation="vertical">
 
-        <!-- TODO(b/150302361): Status bar is commented out since a top inset is being added which causes it to be displayed below the top of the screen. -->
-        <!--        <include
-                    layout="@layout/car_status_bar_header"
-                    android:layout_alignParentTop="true"
-                    android:theme="@android:style/Theme"/>-->
+        <include
+            layout="@layout/car_status_bar_header"
+            android:layout_alignParentTop="true"
+            android:theme="@android:style/Theme"/>
 
 
         <FrameLayout
@@ -42,9 +40,8 @@
                 android:id="@+id/user_grid"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"/>
-            <!-- TODO(b/150302361): Re-add marginTop once status bar has been added back. -->
-            <!--                android:layout_marginTop="@dimen/car_user_switcher_margin_top"/>-->
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="@dimen/car_user_switcher_margin_top"/>
         </FrameLayout>
 
     </LinearLayout>