diff options
| author | Winson Chung <winsonc@google.com> | 2014-09-09 18:33:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 18:33:18 +0000 |
| commit | 69550456e34da774a92a67769b913f516d0acb36 (patch) | |
| tree | 8f21a652a4fd8e2448d2bafb687e5106041c3ee0 /packages/SystemUI/src/com/android/systemui/recents | |
| parent | 31e8d7602c23661fb4540e2858af4833d2347c9f (diff) | |
| parent | 3751c359b4eaac9a7f149d791c8bf811e41fc61b (diff) | |
| download | frameworks_base-69550456e34da774a92a67769b913f516d0acb36.zip frameworks_base-69550456e34da774a92a67769b913f516d0acb36.tar.gz frameworks_base-69550456e34da774a92a67769b913f516d0acb36.tar.bz2 | |
Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/recents')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index 6fe86be..4563597 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -840,7 +840,7 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, @Override public void onClick(final View v) { final TaskView tv = this; - final boolean delayViewClick = (v != this); + final boolean delayViewClick = (v != this) && (v != mActionButtonView); if (delayViewClick) { // We purposely post the handler delayed to allow for the touch feedback to draw postDelayed(new Runnable() { |