From 6b822694d0d25010533292bd201318d333a6d392 Mon Sep 17 00:00:00 2001 From: Sid Soundararajan Date: Thu, 9 Jun 2016 15:40:14 -0700 Subject: [PATCH] Recents TV: Add a check for touch enabled mode for starting dismiss animation Fix until we figure out if Gamepad not eating key events during talkback is inteneded behavior. BUG: 29208918 Change-Id: Iffe652f10e88d0218875264f31e9d7658d75e71e --- .../systemui/recents/tv/views/TaskCardView.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java index 72a589fe3c1aa..e7575608b8196 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java @@ -56,6 +56,7 @@ public class TaskCardView extends LinearLayout { private ImageView mBadgeView; private Task mTask; private boolean mDismissState; + private boolean mTouchExplorationEnabled; private int mCornerRadius; private ViewFocusAnimator mViewFocusAnimator; @@ -90,7 +91,8 @@ public class TaskCardView extends LinearLayout { R.dimen.recents_task_view_rounded_corners_radius); mRecentsRowFocusAnimationHolder = new RecentsRowFocusAnimationHolder(this, mInfoFieldView); SystemServicesProxy ssp = Recents.getSystemServices(); - if (!ssp.isTouchExplorationEnabled()) { + mTouchExplorationEnabled = ssp.isTouchExplorationEnabled(); + if (!mTouchExplorationEnabled) { mDismissIconView.setVisibility(VISIBLE); } else { mDismissIconView.setVisibility(GONE); @@ -237,10 +239,15 @@ public class TaskCardView extends LinearLayout { private void setDismissState(boolean dismissState) { if (mDismissState != dismissState) { mDismissState = dismissState; - if (dismissState) { - mDismissAnimationsHolder.startEnterAnimation(); - } else { - mDismissAnimationsHolder.startExitAnimation(); + // 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) { + mDismissAnimationsHolder.startEnterAnimation(); + } else { + mDismissAnimationsHolder.startExitAnimation(); + } } } }