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

Commit bf9965f2 authored by Arnaud Berry's avatar Arnaud Berry Committed by Android (Google) Code Review
Browse files

Merge "Remove androidx.car_car resources from SysUI"

parents 8630e5ff 50b43b7b

core/res/res/values/dimens_car.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <dimen name="car_fullscreen_user_pod_height">356dp</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_large_avatar_size">96dp</dimen>





    <!-- Application Bar -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3588,6 +3588,7 @@ 
  <java-symbol type="dimen" name="car_fullscreen_user_pod_icon_text_size" />

  <java-symbol type="dimen" name="car_fullscreen_user_pod_image_avatar_height" />

  <java-symbol type="dimen" name="car_fullscreen_user_pod_image_avatar_width" />

  <java-symbol type="dimen" name="car_large_avatar_size" />

  <java-symbol type="layout" name="car_user_switching_dialog" />

  <java-symbol type="id" name="user_loading_avatar" />

  <java-symbol type="id" name="user_loading" />

packages/CarSystemUI/res-keyguard/drawable/keyguard_button_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_pressed="true">

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/car_button_radius"/>

            <corners android:radius="@*android:dimen/car_button_radius"/>

            <solid android:color="#131315"/>

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/car_button_radius"/>

            <corners android:radius="@*android:dimen/car_button_radius"/>

            <solid android:color="@color/button_background"/>

        </shape>

    </item>

packages/CarSystemUI/res-keyguard/layout-land/keyguard_pattern_view.xml

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingHorizontal="@dimen/car_margin">

    android:paddingHorizontal="@*android:dimen/car_margin">



    <FrameLayout

        android:layout_height="match_parent"
@@ -53,10 +53,10 @@ 
        <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/car_padding_2"

            android:layout_margin="@*android:dimen/car_padding_2"

            android:gravity="center"

            android:textColor="@android:color/white"

            android:textSize="@dimen/car_body1_size"

            android:textSize="@*android:dimen/car_body1_size"

            android:text="@string/keyguard_enter_your_pattern" />



        <include layout="@layout/keyguard_message_area" />

packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:paddingHorizontal="@dimen/car_margin">

    android:paddingHorizontal="@*android:dimen/car_margin">



    <FrameLayout

        android:layout_width="0dp"
@@ -72,10 +72,10 @@ 
        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="@dimen/car_padding_2"

            android:layout_margin="@*android:dimen/car_padding_2"

            android:gravity="center"

            android:textColor="@android:color/white"

            android:textSize="@dimen/car_body1_size"

            android:textSize="@*android:dimen/car_body1_size"

            android:text="@string/keyguard_enter_your_pin" />



        <include layout="@layout/keyguard_message_area" />