Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4019ccf2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Updated Fullscreen user switcher to not use fitsSystemWindows." into... 

Merge "Updated Fullscreen user switcher to not use fitsSystemWindows." into rvc-dev am: 9283fb54 am: ad910b31 am: 5a474fd2

Change-Id: I37a73776e5d8e53d7f5587c80cca954bcbba60f1
parents 38e03960 5a474fd2

packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml

+7 −10
Original line number Diff line number Diff line
@@ -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

        <include

            layout="@layout/car_status_bar_header"

            android:layout_alignParentTop="true"

                    android:theme="@android:style/Theme"/>-->

            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>