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

Commit b363fa61 authored by Yein Jo's avatar Yein Jo Committed by Android (Google) Code Review
Browse files

Merge changes from topic "noise-ripple" into tm-qpr-dev 

* changes:
  Add turbulence noise effects after ripple in UMO.
  Add a turbulence noise shader for media player and ghost loading effects.
parents 99be1de5 480643fb

packages/SystemUI/res/layout/media_session_view.xml

+10 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
        android:background="@drawable/qs_media_outline_album_bg"

        />



    <com.android.systemui.ripple.MultiRippleView

    <com.android.systemui.surfaceeffects.ripple.MultiRippleView

        android:id="@+id/touch_ripple_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/qs_media_session_height_expanded"
@@ -53,6 +53,15 @@ 
        app:layout_constraintTop_toTopOf="@id/album_art"

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



    <com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseView

        android:id="@+id/turbulence_noise_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/layout/wireless_charging_layout.xml

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

    android:layout_height="match_parent">



    <com.android.systemui.ripple.RippleView

    <com.android.systemui.surfaceeffects.ripple.RippleView

        android:id="@+id/wireless_charging_ripple"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

packages/SystemUI/res/xml/media_session_collapsed.xml

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ 
        app:layout_constraintTop_toTopOf="@+id/album_art"

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



    <!-- Turbulence noise must have the same constraint as the album art. -->

    <Constraint

        android:id="@+id/turbulence_noise_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
@@ -37,6 +37,16 @@ 
        app:layout_constraintTop_toTopOf="@+id/album_art"

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



    <!-- Turbulence noise must have the same constraint as the album art. -->

    <Constraint

        android:id="@+id/turbulence_noise_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/biometrics/AuthRippleView.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.view.View 
import android.view.animation.PathInterpolator

import com.android.internal.graphics.ColorUtils

import com.android.systemui.animation.Interpolators

import com.android.systemui.ripple.RippleShader

import com.android.systemui.surfaceeffects.ripple.RippleShader



private const val RIPPLE_SPARKLE_STRENGTH: Float = 0.4f