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

Commit f93aa98e authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Set PredictedAppIcon ring disabled when icon is disabled" into tm-qpr-dev

parents acaecb65 1e29b04f

quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
            if (iconShift != null) {

                dragView.animateShift(-iconShift.x, -iconShift.y);

            }

            btv.getIcon().setIsDisabled(true);

            btv.setIconDisabled(true);

            mControllers.taskbarAutohideSuspendController.updateFlag(

                    TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, true);

        });
@@ -453,7 +453,7 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 


    private void maybeOnDragEnd() {

        if (!isDragging()) {

            ((BubbleTextView) mDragObject.originalView).getIcon().setIsDisabled(false);

            ((BubbleTextView) mDragObject.originalView).setIconDisabled(false);

            mControllers.taskbarAutohideSuspendController.updateFlag(

                    TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, false);

            mActivity.onDragEnd();

quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides; 


import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;

import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED;

import static com.android.launcher3.icons.FastBitmapDrawable.getDisabledColorFilter;



import android.animation.Animator;

import android.animation.AnimatorSet;
@@ -54,6 +55,7 @@ import com.android.launcher3.icons.BitmapInfo; 
import com.android.launcher3.icons.GraphicsUtils;

import com.android.launcher3.icons.IconNormalizer;

import com.android.launcher3.icons.LauncherIcons;

import com.android.launcher3.model.data.ItemInfoWithIcon;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.touch.ItemLongClickListener;
@@ -360,6 +362,19 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { 
        canvas.drawPath(mRingPath, mIconRingPaint);

    }



    @Override

    public void setIconDisabled(boolean isDisabled) {

        super.setIconDisabled(isDisabled);

        mIconRingPaint.setColorFilter(isDisabled ? getDisabledColorFilter() : null);

        invalidate();

    }



    @Override

    protected void setItemInfo(ItemInfoWithIcon itemInfo) {

        super.setItemInfo(itemInfo);

        setIconDisabled(itemInfo.isDisabled());

    }



    @Override

    public void getSourceVisualDragBounds(Rect bounds) {

        super.getSourceVisualDragBounds(bounds);

src/com/android/launcher3/BubbleTextView.java

+8 −1
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ import com.android.launcher3.model.data.ItemInfo; 
import com.android.launcher3.model.data.ItemInfoWithIcon;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.popup.PopupContainerWithArrow;

import com.android.launcher3.util.MultiTranslateDelegate;

import com.android.launcher3.search.StringMatcherUtility;

import com.android.launcher3.util.IntArray;

import com.android.launcher3.util.MultiTranslateDelegate;

import com.android.launcher3.util.SafeCloseable;

import com.android.launcher3.util.ShortcutUtil;

import com.android.launcher3.views.ActivityContext;
@@ -978,6 +978,13 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        applyCompoundDrawables(icon);

    }



    /** Sets the icon visual state to disabled or not. */

    public void setIconDisabled(boolean isDisabled) {

        if (mIcon != null) {

            mIcon.setIsDisabled(isDisabled);

        }

    }



    protected boolean iconUpdateAnimationEnabled() {

        return mEnableIconUpdateAnimation;

    }