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

Commit 0c41f4bc authored by Sid Soundararajan's avatar Sid Soundararajan Committed by android-build-merger
Browse files

Merge \"Recents TV: Add a check for touch enabled mode for starting dismiss... 

Merge \"Recents TV: Add a check for touch enabled mode for starting dismiss animation\" into nyc-dev
am: 7476aaa0

Change-Id: I832256859deb5ce9a15d8742cb3a9e21b0e98db9
parents e54c409a 7476aaa0

packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java

+12 −5
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ public class TaskCardView extends LinearLayout { 
    private ImageView mBadgeView;

    private ImageView mBadgeView;

    private Task mTask;

    private Task mTask;

    private boolean mDismissState;

    private boolean mDismissState;

    private boolean mTouchExplorationEnabled;

    private int mCornerRadius;

    private int mCornerRadius;





    private ViewFocusAnimator mViewFocusAnimator;

    private ViewFocusAnimator mViewFocusAnimator;
@@ -90,7 +91,8 @@ public class TaskCardView extends LinearLayout { 
                R.dimen.recents_task_view_rounded_corners_radius);

                R.dimen.recents_task_view_rounded_corners_radius);

        mRecentsRowFocusAnimationHolder = new RecentsRowFocusAnimationHolder(this, mInfoFieldView);

        mRecentsRowFocusAnimationHolder = new RecentsRowFocusAnimationHolder(this, mInfoFieldView);

        SystemServicesProxy ssp = Recents.getSystemServices();

        SystemServicesProxy ssp = Recents.getSystemServices();

        if (!ssp.isTouchExplorationEnabled()) {

        mTouchExplorationEnabled = ssp.isTouchExplorationEnabled();

        if (!mTouchExplorationEnabled) {

            mDismissIconView.setVisibility(VISIBLE);

            mDismissIconView.setVisibility(VISIBLE);

        } else {

        } else {

            mDismissIconView.setVisibility(GONE);

            mDismissIconView.setVisibility(GONE);
@@ -237,6 +239,10 @@ public class TaskCardView extends LinearLayout { 
    private void setDismissState(boolean dismissState) {

    private void setDismissState(boolean dismissState) {

        if (mDismissState != dismissState) {

        if (mDismissState != dismissState) {

            mDismissState = dismissState;

            mDismissState = dismissState;

            // Check for touch exploration to ensure dismiss icon/text do not

            // get animated. This should be removed based on decision from

            // b/29208918

            if (!mTouchExplorationEnabled) {

                if (dismissState) {

                if (dismissState) {

                    mDismissAnimationsHolder.startEnterAnimation();

                    mDismissAnimationsHolder.startEnterAnimation();

                } else {

                } else {
@@ -244,6 +250,7 @@ public class TaskCardView extends LinearLayout { 
                }

                }

            }

            }

        }

        }

    }





    public boolean isInDismissState() {

    public boolean isInDismissState() {

        return mDismissState;

        return mDismissState;