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

Commit 547ba147 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Update lockIconView to directly set the image drawable 

Instead of setting the imageDrawable via LockIconViewController.
This is for cleanup and doesn't actually fix any bugs.

Test: manual
Test: atest LockIconViewControllerTest
Bug: 305234447
Change-Id: I72d02cc817d24bb1c3b85370c59efb421cbfe72c
parent 170208c1

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

+1 −13
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.Color; 
import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.View;
@@ -105,18 +104,6 @@ public class LockIconView extends FrameLayout implements Dumpable { 
        mLockIcon.setImageTintList(ColorStateList.valueOf(mLockIconColor));

    }



    void setImageDrawable(Drawable drawable) {

        mLockIcon.setImageDrawable(drawable);



        if (!mUseBackground) return;



        if (drawable == null) {

            mBgView.setVisibility(View.INVISIBLE);

        } else {

            mBgView.setVisibility(View.VISIBLE);

        }

    }



    /**

     * Whether or not to render the lock icon background. Mainly used for UDPFS.

     */
@@ -197,6 +184,7 @@ public class LockIconView extends FrameLayout implements Dumpable { 
        mLockIcon = new ImageView(context, attrs);

        mLockIcon.setId(R.id.lock_icon);

        mLockIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);

        mLockIcon.setImageDrawable(context.getDrawable(R.drawable.super_lock_icon));

        addView(mLockIcon);

        LayoutParams lp = (LayoutParams) mLockIcon.getLayoutParams();

        lp.height = MATCH_PARENT;

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

+0 −13
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.content.res.Configuration; 
import android.content.res.Resources;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.drawable.AnimatedStateListDrawable;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricSourceType;

import android.os.Process;
@@ -120,9 +119,6 @@ public class LockIconViewController implements Dumpable { 
    private boolean mUdfpsEnrolled;

    private Resources mResources;

    private Context mContext;



    @NonNull private final AnimatedStateListDrawable mIcon;



    @NonNull private CharSequence mUnlockedLabel;

    @NonNull private CharSequence mLockedLabel;

    @NonNull private final VibratorHelper mVibrator;
@@ -147,7 +143,6 @@ public class LockIconViewController implements Dumpable { 
    private boolean mCanDismissLockScreen;

    private int mStatusBarState;

    private boolean mIsKeyguardShowing;

    private Runnable mOnGestureDetectedRunnable;

    private Runnable mLongPressCancelRunnable;



    private boolean mUdfpsSupported;
@@ -232,9 +227,6 @@ public class LockIconViewController implements Dumpable { 


        mMaxBurnInOffsetX = resources.getDimensionPixelSize(R.dimen.udfps_burn_in_offset_x);

        mMaxBurnInOffsetY = resources.getDimensionPixelSize(R.dimen.udfps_burn_in_offset_y);



        mIcon = (AnimatedStateListDrawable)

                resources.getDrawable(R.drawable.super_lock_icon, context.getTheme());

        mUnlockedLabel = resources.getString(R.string.accessibility_unlock_button);

        mLockedLabel = resources.getString(R.string.accessibility_lock_icon);

        mLongPressTimeout = resources.getInteger(R.integer.config_lockIconLongPress);
@@ -270,7 +262,6 @@ public class LockIconViewController implements Dumpable { 
    @SuppressLint("ClickableViewAccessibility")

    public void setLockIconView(LockIconView lockIconView) {

        mView = lockIconView;

        mView.setImageDrawable(mIcon);

        mView.setAccessibilityDelegate(mAccessibilityDelegate);



        if (mFeatureFlags.isEnabled(DOZING_MIGRATION_1)) {
@@ -492,10 +483,6 @@ public class LockIconViewController implements Dumpable { 
        pw.println("mUdfpsSupported: " + mUdfpsSupported);

        pw.println("mUdfpsEnrolled: " + mUdfpsEnrolled);

        pw.println("mIsKeyguardShowing: " + mIsKeyguardShowing);

        pw.println(" mIcon: ");

        for (int state : mIcon.getState()) {

            pw.print(" " + state);

        }

        pw.println();

        pw.println(" mShowUnlockIcon: " + mShowUnlockIcon);

        pw.println(" mShowLockIcon: " + mShowLockIcon);