Merge "Ignore the charging ripple flag." into sc-v2-dev (8833af16) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -93,9 +93,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
		@@ -145,7 +144,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.)