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

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

Merge "Move surface effects package to AnimationLib." into tm-qpr-dev am: 31c7f600 am: f3cb22c0 

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



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

packages/SystemUI/animation/Android.bp

+6 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,12 @@ android_library { 
        "res",

        "res",

    ],

    ],





    static_libs: ["androidx.core_core-animation-nodeps"],

    static_libs: [

        "PluginCoreLib",

        "androidx.core_core-animation-nodeps",

        "androidx.core_core-ktx",

        "androidx.annotation_annotation",

    ],





    manifest: "AndroidManifest.xml",

    manifest: "AndroidManifest.xml",

    kotlincflags: ["-Xjvm-default=all"],

    kotlincflags: ["-Xjvm-default=all"],

packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/MultiRippleController.kt→packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/MultiRippleController.kt

+0 −0

File moved.

View file

packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/MultiRippleView.kt→packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/MultiRippleView.kt

+3 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.Paint 
import android.util.AttributeSet

import android.util.AttributeSet

import android.util.Log

import android.util.Log

import android.view.View

import android.view.View

import androidx.annotation.VisibleForTesting





/**

/**

 * A view that allows multiple ripples to play.

 * A view that allows multiple ripples to play.
@@ -30,7 +31,8 @@ import android.view.View 
 */

 */

class MultiRippleView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {

class MultiRippleView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {





    internal val ripples = ArrayList<RippleAnimation>()

    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)

    val ripples = ArrayList<RippleAnimation>()

    private val listeners = ArrayList<RipplesFinishedListener>()

    private val listeners = ArrayList<RipplesFinishedListener>()

    private val ripplePaint = Paint()

    private val ripplePaint = Paint()

    private var isWarningLogged = false

    private var isWarningLogged = false

packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt→packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleAnimation.kt

+3 −1
Original line number Original line Diff line number Diff line
@@ -19,11 +19,13 @@ package com.android.systemui.surfaceeffects.ripple 
import android.animation.Animator

import android.animation.Animator

import android.animation.AnimatorListenerAdapter

import android.animation.AnimatorListenerAdapter

import android.animation.ValueAnimator

import android.animation.ValueAnimator

import androidx.annotation.VisibleForTesting

import androidx.core.graphics.ColorUtils

import androidx.core.graphics.ColorUtils





/** A single ripple animation. */

/** A single ripple animation. */

class RippleAnimation(private val config: RippleAnimationConfig) {

class RippleAnimation(private val config: RippleAnimationConfig) {

    internal val rippleShader: RippleShader = RippleShader(config.rippleShape)

    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)

    val rippleShader: RippleShader = RippleShader(config.rippleShape)

    private val animator: ValueAnimator = ValueAnimator.ofFloat(0f, 1f)

    private val animator: ValueAnimator = ValueAnimator.ofFloat(0f, 1f)





    init {

    init {

packages/SystemUI/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt→packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleAnimationConfig.kt

+0 −0

File moved.

View file