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

Commit 5f1fd602 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Delete secondary text in charging animation" into pi-dev

parents cf8acd8a 45645708

packages/SystemUI/res/layout/wireless_charging_layout.xml

+0 −7
Original line number Diff line number Diff line
@@ -44,13 +44,6 @@ 
            android:layout_gravity="center"

            android:textSize="32sp"

            android:textColor="?attr/wallpaperTextColor"/>



        <TextView

            android:id="@+id/wireless_charging_secondary_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:textColor="?attr/wallpaperTextColor"/>

    </LinearLayout>



</FrameLayout>
 
 No newline at end of file

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

+1 −11
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ public class WirelessChargingLayout extends FrameLayout { 
        // amount of battery:

        final TextView mPercentage = findViewById(R.id.wireless_charging_percentage);



        // (optional) time until full charge if available

        final TextView mSecondaryText = findViewById(R.id.wireless_charging_secondary_text);



        if (batteryLevel != UNKNOWN_BATTERY_LEVEL) {

            mPercentage.setText(NumberFormat.getPercentInstance().format(mBatteryLevel / 100f));

            mPercentage.setAlpha(0);
@@ -110,17 +107,10 @@ public class WirelessChargingLayout extends FrameLayout { 
        circleFadeAnimator.setInterpolator(Interpolators.LINEAR);

        circleFadeAnimator.setStartDelay(chargingAnimationFadeStartOffset);



        // Animation Opacity: secondary text animation fades from 1 to 0 opacity

        ValueAnimator secondaryTextFadeAnimator = ObjectAnimator.ofFloat(mSecondaryText, "alpha",

                1, 0);

        circleFadeAnimator.setDuration(chargingAnimationFadeDuration);

        secondaryTextFadeAnimator.setInterpolator(Interpolators.LINEAR);

        secondaryTextFadeAnimator.setStartDelay(chargingAnimationFadeStartOffset);



        // play all animations together

        AnimatorSet animatorSet = new AnimatorSet();

        animatorSet.playTogether(textSizeAnimator, textOpacityAnimator, textFadeAnimator,

                circleFadeAnimator, secondaryTextFadeAnimator);

                circleFadeAnimator);

        animatorSet.start();

    }

}
 
 No newline at end of file