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

Merge "Mark header bar buttons as clickable only when they are made visible." into nyc-dev

Browse Source
This commit is contained in:
Winson Chung
2016-04-27 04:02:09 +00:00
committed by Android (Google) Code Review
parent 7072f87b7f 3e5f0af085
commit e433cafe07
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java
View File

@@ -235,7 +235,6 @@ public class TaskViewHeader extends FrameLayout
// Initialize the icon and description views // Initialize the icon and description views
mIconView = (ImageView) findViewById(R.id.icon); mIconView = (ImageView) findViewById(R.id.icon);
mIconView.setClickable(false);
mIconView.setOnLongClickListener(this); mIconView.setOnLongClickListener(this);
mTitleView = (TextView) findViewById(R.id.title); mTitleView = (TextView) findViewById(R.id.title);
mDismissButton = (ImageView) findViewById(R.id.dismiss_task); mDismissButton = (ImageView) findViewById(R.id.dismiss_task);
@@ -459,6 +458,8 @@ public class TaskViewHeader extends FrameLayout
mDismissButton.setImageDrawable(t.useLightOnPrimaryColor ? mDismissButton.setImageDrawable(t.useLightOnPrimaryColor ?
mLightDismissDrawable : mDarkDismissDrawable); mLightDismissDrawable : mDarkDismissDrawable);
mDismissButton.setContentDescription(t.dismissDescription); mDismissButton.setContentDescription(t.dismissDescription);
mDismissButton.setOnClickListener(this);
mDismissButton.setClickable(false);
// When freeform workspaces are enabled, then update the move-task button depending on the // When freeform workspaces are enabled, then update the move-task button depending on the
// current task // current task
@@ -474,6 +475,8 @@ public class TaskViewHeader extends FrameLayout
? mLightFreeformIcon ? mLightFreeformIcon
: mDarkFreeformIcon); : mDarkFreeformIcon);
} }
mMoveTaskButton.setOnClickListener(this);
mMoveTaskButton.setClickable(false);
} }
if (Recents.getDebugFlags().isFastToggleRecentsEnabled()) { if (Recents.getDebugFlags().isFastToggleRecentsEnabled()) {
@@ -491,6 +494,7 @@ public class TaskViewHeader extends FrameLayout
if (touchExplorationEnabled) { if (touchExplorationEnabled) {
mIconView.setContentDescription(t.appInfoDescription); mIconView.setContentDescription(t.appInfoDescription);
mIconView.setOnClickListener(this); mIconView.setOnClickListener(this);
mIconView.setClickable(true);
} }
} }
@@ -509,15 +513,15 @@ public class TaskViewHeader extends FrameLayout
mTask = null; mTask = null;
mIconView.setImageDrawable(null); mIconView.setImageDrawable(null);
if (touchExplorationEnabled) { if (touchExplorationEnabled) {
mIconView.setOnClickListener(null); mIconView.setClickable(false);
} }
} }
/** Animates this task bar if the user does not interact with the stack after a certain time. */ /** Animates this task bar if the user does not interact with the stack after a certain time. */
void startNoUserInteractionAnimation() { void startNoUserInteractionAnimation() {
int duration = getResources().getInteger(R.integer.recents_task_enter_from_app_duration); int duration = getResources().getInteger(R.integer.recents_task_enter_from_app_duration);
mDismissButton.setOnClickListener(this);
mDismissButton.setVisibility(View.VISIBLE); mDismissButton.setVisibility(View.VISIBLE);
mDismissButton.setClickable(true);
if (mDismissButton.getVisibility() == VISIBLE) { if (mDismissButton.getVisibility() == VISIBLE) {
mDismissButton.animate() mDismissButton.animate()
.alpha(1f) .alpha(1f)
@@ -529,8 +533,8 @@ public class TaskViewHeader extends FrameLayout
} }
if (mMoveTaskButton != null) { if (mMoveTaskButton != null) {
if (mMoveTaskButton.getVisibility() == VISIBLE) { if (mMoveTaskButton.getVisibility() == VISIBLE) {
mMoveTaskButton.setOnClickListener(this);
mMoveTaskButton.setVisibility(View.VISIBLE); mMoveTaskButton.setVisibility(View.VISIBLE);
mMoveTaskButton.setClickable(true);
mMoveTaskButton.animate() mMoveTaskButton.animate()
.alpha(1f) .alpha(1f)
.setInterpolator(Interpolators.FAST_OUT_LINEAR_IN) .setInterpolator(Interpolators.FAST_OUT_LINEAR_IN)
@@ -550,12 +554,12 @@ public class TaskViewHeader extends FrameLayout
mDismissButton.setVisibility(View.VISIBLE); mDismissButton.setVisibility(View.VISIBLE);
mDismissButton.animate().cancel(); mDismissButton.animate().cancel();
mDismissButton.setAlpha(1f); mDismissButton.setAlpha(1f);
mDismissButton.setOnClickListener(this); mDismissButton.setClickable(true);
if (mMoveTaskButton != null) { if (mMoveTaskButton != null) {
mMoveTaskButton.setVisibility(View.VISIBLE); mMoveTaskButton.setVisibility(View.VISIBLE);
mMoveTaskButton.animate().cancel(); mMoveTaskButton.animate().cancel();
mMoveTaskButton.setAlpha(1f); mMoveTaskButton.setAlpha(1f);
mMoveTaskButton.setOnClickListener(this); mMoveTaskButton.setClickable(true);
} }
} }
@@ -566,11 +570,11 @@ public class TaskViewHeader extends FrameLayout
void resetNoUserInteractionState() { void resetNoUserInteractionState() {
mDismissButton.setVisibility(View.INVISIBLE); mDismissButton.setVisibility(View.INVISIBLE);
mDismissButton.setAlpha(0f); mDismissButton.setAlpha(0f);
mDismissButton.setOnClickListener(null); mDismissButton.setClickable(false);
if (mMoveTaskButton != null) { if (mMoveTaskButton != null) {
mMoveTaskButton.setVisibility(View.INVISIBLE); mMoveTaskButton.setVisibility(View.INVISIBLE);
mMoveTaskButton.setAlpha(0f); mMoveTaskButton.setAlpha(0f);
mMoveTaskButton.setOnClickListener(null); mMoveTaskButton.setClickable(false);
} }
} }