OSDN Git Service

Recents TV: Add a check for touch enabled mode for starting dismiss animation
authorSid Soundararajan <ssoundar@google.com>
Thu, 9 Jun 2016 22:40:14 +0000 (15:40 -0700)
committerSid Soundararajan <ssoundar@google.com>
Fri, 10 Jun 2016 17:59:48 +0000 (10:59 -0700)
Fix until we figure out if Gamepad not eating key events during talkback is
inteneded behavior.

BUG: 29208918
Change-Id: Iffe652f10e88d0218875264f31e9d7658d75e71e

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

index 72a589f..e757560 100644 (file)
@@ -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();
+                }
             }
         }
     }