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

Commit 7fd09024 authored by Aarthi Balachander's avatar Aarthi Balachander Committed by android-build-merger
Browse files

Merge "Refactoring the User Switcher layout files to use dimensions in... 

Merge "Refactoring the User Switcher layout files to use dimensions in dimens_car.xml and colors_car.xml so that overlays will be easier. Also, added a dialog when adding a user.  Fixed the issue where coming back to the user picker makes the buttons unresponsive" into pi-dev
am: e71fb69e

Change-Id: I42c08bbbfe1a85aa0feca3ea9a00e4891b480dd9
parents 653697a0 e71fb69e

packages/SystemUI/res/drawable/car_add_circle_round.xml

+3 −3
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
    <item>

        <shape android:shape="oval">

            <solid

                android:color="@color/car_dark_blue_grey_600"/>

                android:color="@color/car_user_switcher_add_user_background_color"/>

            <size

                android:width="@dimen/car_fullscreen_user_pod_image_avatar_width"

                android:height="@dimen/car_fullscreen_user_pod_image_avatar_height"/>

                android:width="@dimen/car_user_switcher_image_avatar_size"

                android:height="@dimen/car_user_switcher_image_avatar_size"/>

        </shape>

    </item>

    <item

packages/SystemUI/res/drawable/car_ic_add_white.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 
    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

  <path

      android:fillColor="@color/car_body1_light"

      android:fillColor="@color/car_user_switcher_add_user_add_sign_color"

      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/car_fullscreen_user_pod.xml

+12 −11
Original line number Diff line number Diff line
@@ -16,30 +16,31 @@ 
-->





<RelativeLayout

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:clipChildren="false"

    android:alpha="0"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:gravity="fill_horizontal">

    android:orientation="vertical"

    android:gravity="center"

    >



    <ImageView android:id="@+id/user_avatar"

        android:layout_centerHorizontal="true"

        android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"

        android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height"

        android:layout_width="@dimen/car_user_switcher_image_avatar_size"

        android:layout_height="@dimen/car_user_switcher_image_avatar_size"

        android:background="@drawable/car_button_ripple_background_inverse"

        android:gravity="center"

        />



    <TextView android:id="@+id/user_name"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/car_padding_4"

        android:textSize="@dimen/car_body1_size"

        android:textColor="@color/car_body1_light"

        android:layout_marginTop="@dimen/car_user_switcher_vertical_spacing_between_name_and_avatar"

        android:textSize="@dimen/car_user_switcher_name_text_size"

        android:textColor="@color/car_user_switcher_name_text_color"

        android:ellipsize="end"

        android:singleLine="true"

        android:gravity="center"

        android:layout_below="@id/user_avatar"/>

        android:gravity="center"/>



</RelativeLayout>
 
</LinearLayout>

packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml

+9 −12
Original line number Diff line number Diff line
@@ -19,32 +19,29 @@ 
        android:fitsSystemWindows="true"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/car_card_dark"

        android:background="@color/car_user_switcher_background_color"

        android:visibility="gone">



    <RelativeLayout

    <LinearLayout

        android:id="@+id/container"

        android:background="@color/car_card_dark"

        android:background="@color/car_user_switcher_background_color"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent"

        android:orientation="vertical">



        <include layout="@layout/car_status_bar_header"

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

            android:layout_alignParentTop="true"/>



        <!-- TODO: add app:verticallyCenterListContent="true" when car support lib is updated -->

        <com.android.systemui.statusbar.car.UserGridRecyclerView

            android:id="@+id/user_grid"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_below="@+id/header"

            android:layout_centerHorizontal="true"

            android:layout_centerVertical="true"

            android:layout_alignParentRight="true"

            app:verticallyCenterListContent="true"

            app:dayNightStyle="force_night"

            app:showPagedListViewDivider="false"

            app:gutter="both"

            app:itemSpacing="@dimen/car_padding_5"/>

            app:itemSpacing="@dimen/car_user_switcher_vertical_spacing_between_users"/>



    </RelativeLayout>

    </LinearLayout>

</FrameLayout>

packages/SystemUI/res/layout/car_qs_panel.xml

+3 −8
Original line number Diff line number Diff line
@@ -31,23 +31,18 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

        xmlns:app="http://schemas.android.com/apk/res-auto"

        android:id="@+id/user_switcher_container"

        android:layout_marginStart="@dimen/car_margin"

        android:layout_marginEnd="@dimen/car_margin"

        android:clipChildren="false"

        android:layout_width="match_parent"

        android:layout_height="@dimen/car_user_switcher_container_height">



        <com.android.systemui.statusbar.car.UserGridRecyclerView

            android:id="@+id/user_grid"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerHorizontal="true"

            android:layout_centerVertical="true"

            android:layout_alignParentRight="true"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            app:dayNightStyle="force_night"

            app:showPagedListViewDivider="false"

            app:gutter="both"

            app:itemSpacing="@dimen/car_padding_4"/>

            app:itemSpacing="@dimen/car_user_switcher_vertical_spacing_between_users"/>



    </RelativeLayout>