diff options
| author | vadimt <vadimt@google.com> | 2019-09-25 12:21:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 12:21:06 -0700 |
| commit | eda5c215b706d0c0998023b37812d79eeff23e5b (patch) | |
| tree | 5b792c916ff3e3ec4bd25a3ff58a971114112a36 /quickstep/recents_ui_overrides | |
| parent | 0b72d6a8913012f3f3aab2c28924185accbb6cb4 (diff) | |
| parent | b72cd2629c3c478714154e407e8bf8275c24d8e9 (diff) | |
| download | android_packages_apps_Trebuchet-eda5c215b706d0c0998023b37812d79eeff23e5b.tar.gz android_packages_apps_Trebuchet-eda5c215b706d0c0998023b37812d79eeff23e5b.tar.bz2 android_packages_apps_Trebuchet-eda5c215b706d0c0998023b37812d79eeff23e5b.zip | |
Merge "Removing debug tracing for a fixed bug" into ub-launcher3-qt-qpr1-dev
am: b72cd2629c
Change-Id: Id28e20b5fe23c6f6501f3c7a38305f0a306b287a
Diffstat (limited to 'quickstep/recents_ui_overrides')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java | 9 | ||||
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java index 742d6a24c..07d079664 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java @@ -161,9 +161,6 @@ public class TaskMenuView extends AbstractFloatingView { } public static TaskMenuView showForTask(TaskView taskView) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "showForTask"); - } BaseDraggingActivity activity = BaseDraggingActivity.fromContext(taskView.getContext()); final TaskMenuView taskMenuView = (TaskMenuView) activity.getLayoutInflater().inflate( R.layout.task_menu, activity.getDragLayer(), false); @@ -171,15 +168,9 @@ public class TaskMenuView extends AbstractFloatingView { } private boolean populateAndShowForTask(TaskView taskView) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "populateAndShowForTask1"); - } if (isAttachedToWindow()) { return false; } - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "populateAndShowForTask2"); - } mActivity.getDragLayer().addView(this); mTaskView = taskView; addMenuOptions(mTaskView); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java index 3eed2812a..51802dffd 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java @@ -391,9 +391,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { mIconView.setDrawable(icon); mIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP)); mIconView.setOnLongClickListener(v -> { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.WELLBEING_NO_TASK_MENU, "setOnLongClickListener"); - } requestDisallowInterceptTouchEvent(true); return showTaskMenu(Touch.LONGPRESS); }); |