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 
am: 7476aaa058

Change-Id: I832256859deb5ce9a15d8742cb3a9e21b0e98db9
This commit is contained in:
Sid Soundararajan
2016-06-10 20:42:06 +00:00
committed by android-build-merger
parent e54c409a1f 7476aaa058
commit 0c41f4bcd8
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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 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();
}
}
}
}