summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-07-15 18:48:06 -0700
committervadimt <vadimt@google.com>2019-07-15 18:48:06 -0700
commit7a4ed2f258939f8d558bd9264dfa6f1940883db2 (patch)
tree79e1e14da5f2cc9a3b7aacad13c611bc58ec717f /src/com/android
parentf170b7efcb3558278190d905a0dfe6afa9e735ad (diff)
downloadandroid_packages_apps_Trebuchet-7a4ed2f258939f8d558bd9264dfa6f1940883db2.tar.gz
android_packages_apps_Trebuchet-7a4ed2f258939f8d558bd9264dfa6f1940883db2.tar.bz2
android_packages_apps_Trebuchet-7a4ed2f258939f8d558bd9264dfa6f1940883db2.zip
Removing tracing for fixed bugs
Bug: 133009122 Bug: 133765434 Bug: 134532571 Change-Id: I37aa1851a1bc0874c0b9acf561bde28966e9b523
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/Launcher.java3
-rw-r--r--src/com/android/launcher3/LauncherStateManager.java8
-rw-r--r--src/com/android/launcher3/Workspace.java8
-rw-r--r--src/com/android/launcher3/dragndrop/BaseItemDragListener.java3
-rw-r--r--src/com/android/launcher3/dragndrop/DragController.java22
-rw-r--r--src/com/android/launcher3/popup/PopupContainerWithArrow.java5
-rw-r--r--src/com/android/launcher3/testing/TestProtocol.java3
-rw-r--r--src/com/android/launcher3/views/BaseDragLayer.java8
8 files changed, 0 insertions, 60 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 922983268..03fdc971d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -890,9 +890,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
@Override
protected void onStart() {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "Launcher.onStart");
- }
RaceConditionTracker.onEvent(ON_START_EVT, ENTER);
super.onStart();
if (mLauncherCallbacks != null) {
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index ccd6efaf5..d66e5813b 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -403,10 +403,6 @@ public class LauncherStateManager {
}
private void onStateTransitionStart(LauncherState state) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "onStateTransitionStart");
- }
if (mState != state) {
mState.onStateDisabled(mLauncher);
}
@@ -575,10 +571,6 @@ public class LauncherStateManager {
private final AnimatorSet mAnim;
public StartAnimRunnable(AnimatorSet anim) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "StartAnimRunnable");
- }
mAnim = anim;
}
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9f846bbc4..8cd082299 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -370,10 +370,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
@Override
public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "onDragStart 1");
- }
if (ENFORCE_DRAG_EVENT_ORDER) {
enforceDragParity("onDragStart", 0, 0);
}
@@ -424,10 +420,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
}
// Always enter the spring loaded mode
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "onDragStart 2");
- }
mLauncher.getStateManager().goToState(SPRING_LOADED);
}
diff --git a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
index c719c1c98..1b08723f6 100644
--- a/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
+++ b/src/com/android/launcher3/dragndrop/BaseItemDragListener.java
@@ -137,9 +137,6 @@ public abstract class BaseItemDragListener extends InternalStateHandler implemen
@Override
public boolean shouldStartDrag(double distanceDragged) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_DRAG_TAG, "BIDL.shouldStartDrag");
- }
// Stay in pre-drag mode, if workspace is locked.
return !mLauncher.isWorkspaceLocked();
}
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java
index 72a1abb83..d32dd2eb9 100644
--- a/src/com/android/launcher3/dragndrop/DragController.java
+++ b/src/com/android/launcher3/dragndrop/DragController.java
@@ -474,10 +474,6 @@ public class DragController implements DragDriver.EventListener, TouchController
}
private void handleMoveEvent(int x, int y) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "handleMoveEvent 1");
- }
mDragObject.dragView.move(x, y);
// Drop on someone?
@@ -492,22 +488,8 @@ public class DragController implements DragDriver.EventListener, TouchController
mLastTouch[0] = x;
mLastTouch[1] = y;
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_DRAG_TAG,
- "handleMoveEvent Conditions " +
- mIsInPreDrag + ", " +
- (mIsInPreDrag && mOptions.preDragCondition != null) + ", " +
- (mIsInPreDrag && mOptions.preDragCondition != null
- && mOptions.preDragCondition.shouldStartDrag(
- mDistanceSinceScroll)));
- }
-
if (mIsInPreDrag && mOptions.preDragCondition != null
&& mOptions.preDragCondition.shouldStartDrag(mDistanceSinceScroll)) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "handleMoveEvent 2");
- }
callOnDragStart();
}
}
@@ -545,10 +527,6 @@ public class DragController implements DragDriver.EventListener, TouchController
* Call this from a drag source view.
*/
public boolean onControllerTouchEvent(MotionEvent ev) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "onControllerTouchEvent");
- }
if (mDragDriver == null || mOptions == null || mOptions.isAccessibleDrag) {
return false;
}
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 9719a1892..25d9f7976 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -449,11 +449,6 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
@Override
public boolean shouldStartDrag(double distanceDragged) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_DRAG_TAG,
- "createPreDragCondition().shouldStartDrag " + distanceDragged + ", "
- + mStartDragThreshold);
- }
return distanceDragged > mStartDragThreshold;
}
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index e28eba809..6bdc0ab46 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -74,7 +74,4 @@ public final class TestProtocol {
public static boolean sDebugTracing = false;
public static final String REQUEST_ENABLE_DEBUG_TRACING = "enable-debug-tracing";
public static final String REQUEST_DISABLE_DEBUG_TRACING = "disable-debug-tracing";
- public static final String NO_DRAG_TAG = "b/133009122";
- public static final String NO_START_TASK_TAG = "b/133765434";
- public static final String NO_OVERVIEW_EVENT_TAG = "b/134532571";
}
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 8bf33bf05..594a24630 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -230,10 +230,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
@Override
public boolean onTouchEvent(MotionEvent ev) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "onTouchEvent " + ev);
- }
int action = ev.getAction();
if (action == ACTION_UP || action == ACTION_CANCEL) {
if (mTouchCompleteListener != null) {
@@ -243,10 +239,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
}
if (mActiveController != null) {
- if (TestProtocol.sDebugTracing) {
- android.util.Log.d(TestProtocol.NO_DRAG_TAG,
- "onTouchEvent 1");
- }
return mActiveController.onControllerTouchEvent(ev);
} else {
// In case no child view handled the touch event, we may not get onIntercept anymore