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

Commit f8957114 authored by Andreas Miko's avatar Andreas Miko Committed by Android (Google) Code Review
Browse files

Merge "Fix LockIcon animation" into main

parents 8fa5ce38 651b8436

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+0 −11
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static com.android.systemui.Flags.keyguardBottomAreaRefactor; 
import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset;

import static com.android.systemui.flags.Flags.DOZING_MIGRATION_1;

import static com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED;

import static com.android.systemui.Flags.newAodTransition;

import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;



import android.annotation.SuppressLint;
@@ -395,16 +394,6 @@ public class LockIconViewController implements Dumpable { 
            mView.updateIcon(ICON_LOCK, true);

            mView.setContentDescription(mLockedLabel);

            mView.setVisibility(View.VISIBLE);

        } else if (mIsDozing && newAodTransition()) {

            mView.animate()

                    .alpha(0f)

                    .setDuration(FADE_OUT_DURATION_MS)

                    .withEndAction(() -> {

                        mView.clearIcon();

                        mView.setVisibility(View.INVISIBLE);

                        mView.setContentDescription(null);

                    })

                    .start();

        } else {

            mView.clearIcon();

            mView.setVisibility(View.INVISIBLE);