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

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

Merge "UI modifications for user picker Test: tested on Mojave bug: 75023449" into pi-dev 

am: fd76ec53

Change-Id: I239265ac026c19addc51d21d446c7a3db30a4e21
parents 87c1f0e5 fd76ec53

packages/SystemUI/res/layout/car_fullscreen_user_pod.xml

+12 −20
Original line number Diff line number Diff line
@@ -15,40 +15,32 @@ 
     limitations under the License.

-->





<RelativeLayout

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

    android:clipChildren="false"

    android:alpha="0"

    android:layout_width="wrap_content"

    android:layout_height="@dimen/car_fullscreen_user_pod_height"

    android:layout_gravity="center_horizontal|bottom" >

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:gravity="fill_horizontal"

    android:layout_marginTop="@dimen/car_padding_5"

    android:layout_marginStart="@dimen/car_padding_4">



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

        android:layout_centerHorizontal="true"

        android:layout_marginTop="@dimen/car_fullscreen_user_pod_margin_image_top"

        android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"

        android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height"

        android:layout_above="@id/user_name" />

        />



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

        android:layout_width="@dimen/car_fullscreen_user_pod_width"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/car_fullscreen_user_pod_margin_name_top"

        android:layout_marginBottom="@dimen/car_fullscreen_user_pod_margin_name_bottom"

        android:textSize="@dimen/car_fullscreen_user_pod_name_text_size"

        android:layout_marginTop="@dimen/car_padding_4"

        android:textSize="@dimen/car_body1_size"

        android:textColor="@color/qs_user_detail_name"

        android:ellipsize="end"

        android:singleLine="true"

        android:gravity="center_horizontal"

        android:layout_above="@id/device_name" />

        android:gravity="center"

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



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

        android:layout_width="@dimen/car_fullscreen_user_pod_width"

        android:layout_height="wrap_content"

        android:textSize="@dimen/car_fullscreen_user_pod_device_text_size"

        android:textColor="@color/qs_user_detail_name"

        android:ellipsize="end"

        android:singleLine="true"

        android:gravity="center_horizontal"

        android:layout_alignParentBottom="true" />

</RelativeLayout>

packages/SystemUI/res/layout/car_fullscreen_user_pod_container.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

     Copyright (C) 2017 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

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

    android:clipChildren="false"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center" >



    <!-- car_fullscreen_user_pods will be dynamically added here. -->

</LinearLayout>

packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml

+26 −19
Original line number Diff line number Diff line
@@ -39,27 +39,34 @@ 
            android:theme="@android:style/Theme"

            android:layout_alignParentTop="true"/>



        <com.android.systemui.statusbar.car.UserGridView

            android:id="@+id/user_grid"

        <RelativeLayout

            android:id="@+id/fullscreen_user_switcher_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginLeft="@dimen/car_margin"

            android:layout_marginRight="@dimen/car_margin"

            android:layout_centerInParent="true"/>

            android:layout_height="match_parent"

            android:layout_marginStart="@dimen/car_margin"

            android:layout_marginEnd="@dimen/car_margin">



        <com.android.systemui.statusbar.car.PageIndicator

            android:id="@+id/user_switcher_page_indicator"

            <RelativeLayout

                android:id="@+id/fullscreen_user_switcher_container_inner"

                android:layout_width="match_parent"

            android:layout_height="@dimen/car_page_indicator_dot_diameter"

            android:layout_below="@+id/user_grid" />

                android:layout_height="match_parent"

                android:layout_marginEnd="@dimen/car_padding_4">



        <Button

            android:id="@+id/start_driving"

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

                    android:id="@+id/user_grid"

                    android:layout_width="wrap_content"

            android:layout_height="@dimen/car_start_driving_height"

            android:text="@string/start_driving"

            style="@style/CarUserSwitcher.StartDrivingButton"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true" />

                    android:layout_height="wrap_content"

                    android:layout_below="@+id/header"

                    android:scrollbars="vertical"

                    android:scrollbarFadeDuration="0"

                    android:verticalScrollbarPosition="left"

                    android:layout_centerHorizontal="true"

                    android:layout_centerVertical="true"

                    android:layout_alignParentRight="true"/>



            </RelativeLayout>



        </RelativeLayout>



    </RelativeLayout>

</FrameLayout>

packages/SystemUI/res/layout/car_qs_panel.xml

+19 −17
Original line number Diff line number Diff line
@@ -30,27 +30,29 @@ 
    <RelativeLayout

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

        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"

        android:layout_gravity="center_horizontal" >

        android:layout_height="@dimen/car_user_switcher_container_height">



        <com.android.systemui.statusbar.car.UserGridView

            android:id="@+id/user_grid"

            android:clipChildren="false"

        <RelativeLayout

            android:id="@+id/fullscreen_user_switcher_container_inner"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginLeft="@dimen/car_margin"

            android:layout_marginRight="@dimen/car_margin"

            android:layout_above="@id/user_switcher_page_indicator" />

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/car_padding_4">



        <com.android.systemui.statusbar.car.PageIndicator

            android:id="@+id/user_switcher_page_indicator"

            android:layout_width="match_parent"

            android:layout_height="@dimen/car_page_indicator_dot_diameter"

            android:layout_marginBottom="@dimen/car_page_indicator_margin_bottom"

            android:alpha="0"

            android:layout_alignParentBottom="true" />

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

                android:id="@+id/user_grid"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:scrollbars="vertical"

                android:verticalScrollbarPosition="left"

                android:layout_centerHorizontal="true"

                android:layout_centerVertical="true"

                android:layout_alignParentRight="true"

                android:scrollbarFadeDuration="0"/>

        </RelativeLayout>



    </RelativeLayout>

packages/SystemUI/res/values/dimens_car.xml

+6 −10
Original line number Diff line number Diff line
@@ -17,18 +17,14 @@ 
-->

<resources>

    <dimen name="car_margin">148dp</dimen>

    <dimen name="car_margin_standard">112dp</dimen>



    <dimen name="car_fullscreen_user_pod_margin_image_top">24dp</dimen>

    <dimen name="car_fullscreen_user_pod_margin_name_top">24dp</dimen>

    <dimen name="car_fullscreen_user_pod_margin_name_bottom">20dp</dimen>

    <dimen name="car_fullscreen_user_pod_margin_between">24dp</dimen>

    <dimen name="car_fullscreen_user_pod_icon_text_size">96dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_width">192dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_height">192dp</dimen>

    <dimen name="car_fullscreen_user_pod_width">264dp</dimen>

    <!-- TODO replace with car support lib sizes when available -->

    <dimen name="car_fullscreen_user_pod_icon_text_size">32sp</dimen>

    <dimen name="car_fullscreen_user_pod_width">243dp</dimen>

    <dimen name="car_fullscreen_user_pod_height">356dp</dimen>

    <dimen name="car_fullscreen_user_pod_name_text_size">40sp</dimen> <!-- B1 -->

    <dimen name="car_fullscreen_user_pod_device_text_size">@dimen/car_body2_size</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_width">96dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_height">96dp</dimen>



    <dimen name="car_navigation_button_width">64dp</dimen>

    <dimen name="car_navigation_bar_width">760dp</dimen>