summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJianYang Liu <jianyliu@google.com>2020-03-06 14:04:37 -0800
committerJianYang Liu <jianyliu@google.com>2020-03-06 14:04:37 -0800
commit05649fcf17bbbfee83364a67e84cd15dff96e9bd (patch)
tree81852661b3d5ba4764f6bfbed7476f8c96fd1e37
parentb092cecbd3d2009c206418dda5143c2aa43b5348 (diff)
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
-rw-r--r--packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml17
1 files 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 55207b335aed..6ecab5182f13 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>