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

Commit bf3f1067 authored by Yein Jo's avatar Yein Jo Committed by Automerger Merge Worker
Browse files

Merge changes Ib7409c94,Ic199a555 into tm-qpr-dev am: 5f854f01 am: 201efbba 

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



Change-Id: Ib9bc3796c6600d4206dcc18269246d47f6892b3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1532b6c 201efbba

packages/SystemUI/res/layout/media_session_view.xml

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,15 @@ 
        android:background="@drawable/qs_media_outline_album_bg"

        />



    <com.android.systemui.ripple.MultiRippleView

        android:id="@+id/touch_ripple_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/qs_media_session_height_expanded"

        app:layout_constraintStart_toStartOf="@id/album_art"

        app:layout_constraintEnd_toEndOf="@id/album_art"

        app:layout_constraintTop_toTopOf="@id/album_art"

        app:layout_constraintBottom_toBottomOf="@id/album_art" />



    <!-- Guideline for output switcher -->

    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/center_vertical_guideline"

packages/SystemUI/res/xml/media_session_collapsed.xml

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ 
        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent" />



    <!-- Touch ripple must have the same constraint as the album art. -->

    <Constraint

        android:id="@+id/touch_ripple_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/qs_media_session_height_collapsed"

        app:layout_constraintStart_toStartOf="@+id/album_art"

        app:layout_constraintEnd_toEndOf="@+id/album_art"

        app:layout_constraintTop_toTopOf="@+id/album_art"

        app:layout_constraintBottom_toBottomOf="@+id/album_art" />



    <Constraint

        android:id="@+id/header_title"

        android:layout_width="wrap_content"

packages/SystemUI/res/xml/media_session_expanded.xml

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ 
        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent" />



    <!-- Touch ripple must have the same constraint as the album art. -->

    <Constraint

        android:id="@+id/touch_ripple_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/qs_media_session_height_expanded"

        app:layout_constraintStart_toStartOf="@+id/album_art"

        app:layout_constraintEnd_toEndOf="@+id/album_art"

        app:layout_constraintTop_toTopOf="@+id/album_art"

        app:layout_constraintBottom_toBottomOf="@+id/album_art" />



    <Constraint

        android:id="@+id/header_title"

        android:layout_width="wrap_content"

packages/SystemUI/src/com/android/systemui/charging/WiredChargingRippleController.kt

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ class WiredChargingRippleController @Inject constructor( 
    }



    fun startRipple() {

        if (rippleView.rippleInProgress || rippleView.parent != null) {

        if (rippleView.rippleInProgress() || rippleView.parent != null) {

            // Skip if ripple is still playing, or not playing but already added the parent

            // (which might happen just before the animation starts or right after

            // the animation ends.)

packages/SystemUI/src/com/android/systemui/charging/WirelessChargingLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ import android.widget.TextView; 
import com.android.settingslib.Utils;

import com.android.systemui.R;

import com.android.systemui.animation.Interpolators;

import com.android.systemui.ripple.RippleAnimationConfig;

import com.android.systemui.ripple.RippleShader.RippleShape;

import com.android.systemui.ripple.RippleView;

import com.android.systemui.ripple.RippleViewKt;



import java.text.NumberFormat;
@@ -150,7 +150,7 @@ final class WirelessChargingLayout extends FrameLayout { 
            mRippleView.setColor(color, 28);

        } else {

            mRippleView.setDuration(CIRCLE_RIPPLE_ANIMATION_DURATION);

            mRippleView.setColor(color, RippleViewKt.RIPPLE_DEFAULT_ALPHA);

            mRippleView.setColor(color, RippleAnimationConfig.RIPPLE_DEFAULT_ALPHA);

        }



        OnAttachStateChangeListener listener = new OnAttachStateChangeListener() {