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

Commit 874cb8e5 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix flake in StatusbarChipsScreenshotTest"" into main

parents 234e7c73 f3591c3a

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java

+1 −3
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
    public static final int MODE_ON = 1;

    public static final int MODE_OFF = 2;

    public static final int MODE_ESTIMATE = 3;

    @VisibleForTesting

    public static final long LAYOUT_TRANSITION_DURATION = 200;



    private final AccessorizedBatteryDrawable mDrawable;

    private final ImageView mBatteryIconView;
@@ -136,7 +134,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 


    private void setupLayoutTransition() {

        LayoutTransition transition = new LayoutTransition();

        transition.setDuration(LAYOUT_TRANSITION_DURATION);

        transition.setDuration(200);



        // Animates appearing/disappearing of the battery percentage text using fade-in/fade-out

        // and disables all other animation types