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

Commit 7e8cab58 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Update wireless charging layout to match the new design." into sc-dev am: 6dbef56e 

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

Change-Id: I45aabc5a10bfa9416437f209551aabda9f389e8c
parents 8e1a5fec 6dbef56e

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ 
        0

    </item>

    <!-- Ending text size in sp of batteryLevel for wireless charging animation -->

    <item name="wireless_charging_anim_battery_level_text_size_end" format="float" type="dimen">24

    <item name="wireless_charging_anim_battery_level_text_size_end" format="float" type="dimen">48

    </item>

    <!-- time until battery info is at full opacity-->

    <integer name="wireless_charging_anim_opacity_offset">80</integer>

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import android.view.WindowManager; 
 */

public class WirelessChargingAnimation {



    public static final long DURATION = 1133;

    public static final long DURATION = 1500;

    private static final String TAG = "WirelessChargingView";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

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

+17 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.AnimatorSet; 
import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.content.Context;

import android.graphics.Color;

import android.graphics.PointF;

import android.util.AttributeSet;

import android.util.TypedValue;
@@ -42,7 +43,9 @@ import java.text.NumberFormat; 
 */

public class WirelessChargingLayout extends FrameLayout {

    public static final int UNKNOWN_BATTERY_LEVEL = -1;

    private static final long RIPPLE_ANIMATION_DURATION = 1133;

    private static final long RIPPLE_ANIMATION_DURATION = 1500;

    private static final int SCRIM_COLOR = 0x4C000000;

    private static final int SCRIM_FADE_DURATION = 300;

    private ChargingRippleView mRippleView;



    public WirelessChargingLayout(Context context) {
@@ -121,6 +124,19 @@ public class WirelessChargingLayout extends FrameLayout { 
        AnimatorSet animatorSet = new AnimatorSet();

        animatorSet.playTogether(textSizeAnimator, textOpacityAnimator, textFadeAnimator);



        ValueAnimator scrimFadeInAnimator = ObjectAnimator.ofArgb(this,

                "backgroundColor", Color.TRANSPARENT, SCRIM_COLOR);

        scrimFadeInAnimator.setDuration(SCRIM_FADE_DURATION);

        scrimFadeInAnimator.setInterpolator(Interpolators.LINEAR);

        ValueAnimator scrimFadeOutAnimator = ObjectAnimator.ofArgb(this,

                "backgroundColor", SCRIM_COLOR, Color.TRANSPARENT);

        scrimFadeOutAnimator.setDuration(SCRIM_FADE_DURATION);

        scrimFadeOutAnimator.setInterpolator(Interpolators.LINEAR);

        scrimFadeOutAnimator.setStartDelay(RIPPLE_ANIMATION_DURATION - SCRIM_FADE_DURATION);

        AnimatorSet animatorSetScrim = new AnimatorSet();

        animatorSetScrim.playTogether(scrimFadeInAnimator, scrimFadeOutAnimator);

        animatorSetScrim.start();



        mRippleView = findViewById(R.id.wireless_charging_ripple);

        OnAttachStateChangeListener listener = new OnAttachStateChangeListener() {

            @Override