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

Commit 3b9b9d08 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes I7fcac406,I7f11c26e into udc-dev am: f9d4ab8a am: f053737b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22454225



Change-Id: If2a813c6f14d4e68069ced140a896ff5b042c5f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf9dd002 f053737b

packages/SystemUI/res/drawable/chipbar_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape

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

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

    <solid android:color="?androidprv:attr/colorAccentSecondary" />

    <solid android:color="?androidprv:attr/materialColorSecondaryFixed" />

    <corners android:radius="32dp" />

</shape>

packages/SystemUI/res/drawable/chipbar_end_button_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:color="?android:textColorPrimary">

    <item android:id="@android:id/background">

        <shape>

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

            <solid android:color="?androidprv:attr/materialColorPrimaryFixedDim"/>

            <corners android:radius="24dp" />

        </shape>

    </item>

packages/SystemUI/res/layout/chipbar.xml

+7 −5
Original line number Diff line number Diff line
@@ -49,15 +49,17 @@ 
            android:alpha="0.0"

            />



        <!-- LINT.IfChange textColor -->

        <TextView

            android:id="@+id/text"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:textSize="@dimen/chipbar_text_size"

            android:textColor="@color/chipbar_text_and_icon_color"

            style="@style/Chipbar.Text"

            android:textColor="?androidprv:attr/materialColorOnSecondaryFixed"

            android:alpha="0.0"

            />

        <!-- LINT.ThenChange(systemui.temporarydisplay.chipbar.ChipbarInfo.kt) -->



        <!-- At most one of [loading, failure_icon, undo] will be visible at a time. -->

        <ImageView
@@ -66,7 +68,7 @@ 
            android:layout_height="@dimen/chipbar_end_icon_size"

            android:layout_marginStart="@dimen/chipbar_end_item_start_margin"

            android:src="@drawable/ic_progress_activity"

            android:tint="@android:color/system_accent2_700"

            android:tint="?androidprv:attr/materialColorOnSecondaryFixedVariant"

            android:alpha="0.0"

            />
@@ -84,9 +86,9 @@ 
            android:id="@+id/end_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="?androidprv:attr/textColorOnAccent"

            android:layout_marginStart="@dimen/chipbar_end_item_start_margin"

            android:textSize="@dimen/chipbar_text_size"

            style="@style/Chipbar.Text"

            android:textColor="?androidprv:attr/materialColorOnPrimaryFixed"

            android:paddingStart="@dimen/chipbar_outer_padding"

            android:paddingEnd="@dimen/chipbar_outer_padding"

            android:paddingTop="@dimen/chipbar_end_button_vertical_padding"

packages/SystemUI/res/values/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -231,9 +231,6 @@ 


    <color name="people_tile_background">@color/material_dynamic_secondary95</color>



    <!-- Chipbar -->

    <color name="chipbar_text_and_icon_color">@android:color/system_accent2_900</color>



    <!-- Internet Dialog -->

    <!-- Material next state on color-->

    <color name="settingslib_state_on_color">@color/settingslib_state_on</color>

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -1110,6 +1110,7 @@ 
    <!-- Chipbar -->

    <!-- (Used for media tap-to-transfer chip for sender device and active unlock) -->

    <dimen name="chipbar_outer_padding">16dp</dimen>

    <dimen name="chipbar_outer_padding_half">8dp</dimen>

    <dimen name="chipbar_text_size">16sp</dimen>

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

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