Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sid Soundararajan
2016-06-10 20:37:59 +00:00
committed by Android (Google) Code Review
parent cbfc6eed32 6b822694d0
commit 7476aaa058
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;