Merge "Removing debug tracing for a fixed bug" into ub-launcher3-qt-qpr1-dev

am: b72cd2629c

Change-Id: Id28e20b5fe23c6f6501f3c7a38305f0a306b287a
This commit is contained in:
vadimt
2019-09-25 12:21:06 -07:00
committed by android-build-merger
3 changed files with 0 additions and 13 deletions

View File

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

View File

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

View File

@@ -86,5 +86,4 @@ public final class TestProtocol {
public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824";
public static final String NO_DRAG_TO_WORKSPACE = "b/138729456";
public static final String APP_NOT_DISABLED = "b/139891609";
public static final String WELLBEING_NO_TASK_MENU = "b/141275518";
}