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

Commit 9e009bb0 authored by Bryan Eyler's avatar Bryan Eyler Committed by Android (Google) Code Review
Browse files

Merge "Add spacing in QS footer and user switcher." into oc-mr1-dev

parents 42aed466 fbc5d504
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@
    <TextView android:id="@+id/user_name"
        android:layout_width="@dimen/car_fullscreen_user_pod_width"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/car_fullscreen_user_pod_margin_above_text"
        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_text_size"
        android:textColor="@color/qs_user_detail_name"
        android:ellipsize="end"
+12 −11
Original line number Diff line number Diff line
@@ -18,23 +18,24 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/qs_footer"
    android:layout_width="match_parent"
    android:layout_height="@dimen/qs_footer_height"
    android:layout_height="@dimen/car_qs_footer_height"
    android:baselineAligned="false"
    android:clickable="false"
    android:clipChildren="false"
    android:clipToPadding="false"
    android:paddingBottom="16dp"
    android:paddingTop="16dp"
    android:paddingEnd="32dp"
    android:paddingStart="32dp"
    android:paddingBottom="@dimen/car_qs_footer_padding_bottom"
    android:paddingTop="@dimen/car_qs_footer_padding_top"
    android:paddingEnd="@dimen/car_qs_footer_padding_end"
    android:paddingStart="@dimen/car_qs_footer_padding_start"
    android:gravity="center_vertical">

    <com.android.systemui.statusbar.phone.MultiUserSwitch
        android:id="@+id/multi_user_switch"
        android:layout_alignParentStart="true"
        android:layout_centerVertical="true"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_width="@dimen/car_qs_footer_icon_width"
        android:layout_height="@dimen/car_qs_footer_icon_height"
        android:layout_marginRight="@dimen/car_qs_footer_user_switch_margin_right"
        android:background="@drawable/ripple_drawable"
        android:focusable="true">

@@ -43,14 +44,14 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_gravity="center"
            android:scaleType="centerInside"/>
            android:scaleType="fitCenter"/>
    </com.android.systemui.statusbar.phone.MultiUserSwitch>

    <TextView android:id="@+id/user_name"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:textSize="@dimen/car_qs_footer_user_name_text_size"
        android:textColor="@color/qs_user_detail_name"
        android:textColor="@color/car_qs_footer_user_name_color"
        android:gravity="start|center_vertical"
        android:layout_centerVertical="true"
        android:layout_toEndOf="@id/multi_user_switch" />
@@ -59,8 +60,8 @@
        android:id="@+id/settings_button"
        android:layout_alignParentEnd="true"
        android:layout_centerVertical="true"
        android:layout_width="48dp"
        android:layout_height="48dp"
        android:layout_width="@dimen/car_qs_footer_icon_width"
        android:layout_height="@dimen/car_qs_footer_icon_height"
        android:background="@drawable/ripple_drawable"
        android:contentDescription="@string/accessibility_quick_settings_settings"
        android:scaleType="centerCrop"
+8 −4
Original line number Diff line number Diff line
@@ -20,8 +20,12 @@
    <color name="car_qs_background_primary">#263238</color> <!-- Blue Gray 900 -->
    <color name="car_user_switcher_progress_bgcolor">#00000000</color> <!-- Transparent -->
    <color name="car_user_switcher_progress_fgcolor">#80CBC4</color> <!-- Teal 200 -->
    <color name="car_user_switcher_no_user_image_bgcolor">#FAFAFA</color> <!-- Grey 50 -->
    <color name="car_user_switcher_no_user_image_fgcolor">#212121</color> <!-- Grey 900 -->
    <color name="car_start_driving_background">#FAFAFA</color> <!-- Grey 50 -->
    <color name="car_start_driving_text">#212121</color> <!-- Grey 900 -->
    <color name="car_user_switcher_no_user_image_bgcolor">@color/car_grey_50</color>
    <color name="car_user_switcher_no_user_image_fgcolor">@color/car_grey_900</color>
    <color name="car_start_driving_background">@color/car_grey_50</color>
    <color name="car_start_driving_text">@color/car_grey_900</color>
    <color name="car_qs_footer_user_name_color">@color/car_grey_50</color>

    <color name="car_grey_50">#FAFAFA</color>
    <color name="car_grey_900">#212121</color>
</resources>
+10 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@
<resources>
    <dimen name="car_margin">148dp</dimen>

    <dimen name="car_fullscreen_user_pod_margin_above_text">24dp</dimen>
    <dimen name="car_fullscreen_user_pod_margin_name_top">24dp</dimen>
    <dimen name="car_fullscreen_user_pod_margin_name_bottom">64dp</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>
@@ -39,6 +40,14 @@
    <dimen name="car_start_driving_height">80dp</dimen>
    <dimen name="car_start_driving_text_size">@dimen/car_body2_size</dimen>

    <dimen name="car_qs_footer_height">112dp</dimen>
    <dimen name="car_qs_footer_padding_bottom">16dp</dimen>
    <dimen name="car_qs_footer_padding_top">16dp</dimen>
    <dimen name="car_qs_footer_padding_end">46dp</dimen>
    <dimen name="car_qs_footer_padding_start">46dp</dimen>
    <dimen name="car_qs_footer_icon_width">56dp</dimen>
    <dimen name="car_qs_footer_icon_height">56dp</dimen>
    <dimen name="car_qs_footer_user_switch_margin_right">46dp</dimen>
    <dimen name="car_qs_footer_user_name_text_size">@dimen/car_body2_size</dimen>

    <dimen name="car_body2_size">26sp</dimen>