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

Commit 64d278d4 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Ignore the charging ripple flag." into sc-v2-dev am: 8833af16 am: 3a7b2c16 

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

Change-Id: Iee324e86c07e2e2dd3a7c73c36b9f0809d690568
parents d448dc23 3a7b2c16

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

+3 −4
Original line number Diff line number Diff line
@@ -94,9 +94,8 @@ class WiredChargingRippleController @Inject constructor( 
                nowPluggedIn: Boolean,

                charging: Boolean

            ) {

                // Suppresses the ripple when it's disabled, or when the state change comes

                // from wireless charging.

                if (!rippleEnabled || batteryController.isPluggedInWireless) {

                // Suppresses the ripple when the state change comes from wireless charging.

                if (batteryController.isPluggedInWireless) {

                    return

                }

                val wasPluggedIn = pluggedIn
@@ -146,7 +145,7 @@ class WiredChargingRippleController @Inject constructor( 
    }



    fun startRipple() {

        if (!rippleEnabled || 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.)