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

Commit 4626fa48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I3c1f0ebb,I6bf500c5,I86ff54f9,Ia2441b38 into tm-qpr-dev 

* changes:
  [Chipbar] Add logs at the exact time WindowManager calls are made.
  [Media TTT] Align the timeout with heads up notifications.
  [Chipbar] Update the colors to make the chipbar stand out more.
  [Chipbar] Re-name the dimens to be chipbar instead of media_ttt.
parents 2b2deec8 6595af03

packages/SystemUI/res/drawable/media_ttt_chip_background.xml→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/colorSurface" />

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

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

</shape>

packages/SystemUI/res/drawable/media_ttt_undo_background.xml→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="?androidprv:attr/colorAccentPrimary"/>

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

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

        </shape>

    </item>

packages/SystemUI/res/layout/chipbar.xml

+23 −24
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
        android:orientation="horizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="@dimen/media_ttt_chip_outer_padding"

        android:background="@drawable/media_ttt_chip_background"

        android:padding="@dimen/chipbar_outer_padding"

        android:background="@drawable/chipbar_background"

        android:layout_marginTop="20dp"

        android:layout_marginStart="@dimen/notification_side_paddings"

        android:layout_marginEnd="@dimen/notification_side_paddings"
@@ -43,8 +43,8 @@ 


        <com.android.internal.widget.CachingIconView

            android:id="@+id/start_icon"

            android:layout_width="@dimen/media_ttt_app_icon_size"

            android:layout_height="@dimen/media_ttt_app_icon_size"

            android:layout_width="@dimen/chipbar_start_icon_size"

            android:layout_height="@dimen/chipbar_start_icon_size"

            android:layout_marginEnd="12dp"

            android:alpha="0.0"

            />
@@ -54,47 +54,46 @@ 
            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:textSize="@dimen/media_ttt_text_size"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="@dimen/chipbar_text_size"

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

            android:alpha="0.0"

            />



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

        <ImageView

            android:id="@+id/loading"

            android:layout_width="@dimen/media_ttt_status_icon_size"

            android:layout_height="@dimen/media_ttt_status_icon_size"

            android:layout_marginStart="@dimen/media_ttt_last_item_start_margin"

            android:layout_width="@dimen/chipbar_end_icon_size"

            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="?androidprv:attr/colorAccentPrimaryVariant"

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

            android:alpha="0.0"

            />



        <ImageView

            android:id="@+id/error"

            android:layout_width="@dimen/media_ttt_status_icon_size"

            android:layout_height="@dimen/media_ttt_status_icon_size"

            android:layout_marginStart="@dimen/media_ttt_last_item_start_margin"

            android:layout_width="@dimen/chipbar_end_icon_size"

            android:layout_height="@dimen/chipbar_end_icon_size"

            android:layout_marginStart="@dimen/chipbar_end_item_start_margin"

            android:src="@drawable/ic_warning"

            android:tint="@color/GM2_red_500"

            android:tint="@color/GM2_red_600"

            android:alpha="0.0"

            />



        <!-- TODO(b/245610654): Re-name all the media-specific dimens to chipbar dimens instead. -->

        <TextView

            android:id="@+id/end_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

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

            android:layout_marginStart="@dimen/media_ttt_last_item_start_margin"

            android:textSize="@dimen/media_ttt_text_size"

            android:paddingStart="@dimen/media_ttt_chip_outer_padding"

            android:paddingEnd="@dimen/media_ttt_chip_outer_padding"

            android:paddingTop="@dimen/media_ttt_undo_button_vertical_padding"

            android:paddingBottom="@dimen/media_ttt_undo_button_vertical_padding"

            android:layout_marginTop="@dimen/media_ttt_undo_button_vertical_negative_margin"

            android:layout_marginBottom="@dimen/media_ttt_undo_button_vertical_negative_margin"

            android:background="@drawable/media_ttt_undo_background"

            android:layout_marginStart="@dimen/chipbar_end_item_start_margin"

            android:textSize="@dimen/chipbar_text_size"

            android:paddingStart="@dimen/chipbar_outer_padding"

            android:paddingEnd="@dimen/chipbar_outer_padding"

            android:paddingTop="@dimen/chipbar_end_button_vertical_padding"

            android:paddingBottom="@dimen/chipbar_end_button_vertical_padding"

            android:layout_marginTop="@dimen/chipbar_end_button_vertical_negative_margin"

            android:layout_marginBottom="@dimen/chipbar_end_button_vertical_negative_margin"

            android:background="@drawable/chipbar_end_button_background"

            android:alpha="0.0"

            />

packages/SystemUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 


    <color name="GM2_red_300">#F28B82</color>

    <color name="GM2_red_500">#EA4335</color>

    <color name="GM2_red_600">#B3261E</color>

    <color name="GM2_red_700">#C5221F</color>



    <color name="GM2_blue_300">#8AB4F8</color>

packages/SystemUI/res/values/dimens.xml

+9 −8
Original line number Diff line number Diff line
@@ -1111,14 +1111,15 @@ 
    <dimen name="qs_media_rec_album_title_bottom_margin">22dp</dimen>

    <dimen name="qs_media_rec_album_subtitle_height">12dp</dimen>



    <!-- Media tap-to-transfer chip for sender device -->

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

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

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

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

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

    <dimen name="media_ttt_undo_button_vertical_negative_margin">-8dp</dimen>

    <dimen name="media_ttt_last_item_start_margin">12dp</dimen>

    <!-- Chipbar -->

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

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

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

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

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

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

    <dimen name="chipbar_end_button_vertical_negative_margin">-8dp</dimen>

    <dimen name="chipbar_end_item_start_margin">12dp</dimen>



    <!-- Media tap-to-transfer chip for receiver device -->

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