summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-07-11 12:52:43 -0700
committerVadim Tryshev <vadimt@google.com>2019-07-11 20:18:32 +0000
commit2af71dd058deb86dd575b0043ad87cf1ba16c596 (patch)
tree1104256d0b7021aa1da8cc340194ce9ade698be9 /src/com
parentc127dff1812fd5059ba16cf92de608c6f79de196 (diff)
downloadandroid_packages_apps_Trebuchet-2af71dd058deb86dd575b0043ad87cf1ba16c596.tar.gz
android_packages_apps_Trebuchet-2af71dd058deb86dd575b0043ad87cf1ba16c596.tar.bz2
android_packages_apps_Trebuchet-2af71dd058deb86dd575b0043ad87cf1ba16c596.zip
Removing tracing for a fixed bug.
Bug: 133867119 Change-Id: I796118f5ff0c27db002bb0e3369e651c95b06bbe
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/LauncherStateManager.java5
-rw-r--r--src/com/android/launcher3/allapps/AllAppsTransitionController.java4
-rw-r--r--src/com/android/launcher3/compat/AccessibilityManagerCompat.java3
-rw-r--r--src/com/android/launcher3/testing/TestProtocol.java2
-rw-r--r--src/com/android/launcher3/touch/AbstractStateChangeTouchController.java26
-rw-r--r--src/com/android/launcher3/touch/SwipeDetector.java17
-rw-r--r--src/com/android/launcher3/views/BaseDragLayer.java6
7 files changed, 0 insertions, 63 deletions
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index 2c8c20845..ccd6efaf5 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -429,11 +429,6 @@ public class LauncherStateManager {
// Only change the stable states after the transitions have finished
if (state != mCurrentStableState) {
mLastStableState = state.getHistoryForState(mCurrentStableState);
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG,
- "mCurrentStableState = " + state.getClass().getSimpleName() + " @ " +
- android.util.Log.getStackTraceString(new Throwable()));
- }
mCurrentStableState = state;
}
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 4683893ea..a64374bc3 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -168,10 +168,6 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil
@Override
public void setStateWithAnimation(LauncherState toState,
AnimatorSetBuilder builder, AnimationConfig config) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG,
- "setStateWithAnimation " + toState.getClass().getSimpleName());
- }
float targetProgress = toState.getVerticalProgress(mLauncher);
if (Float.compare(mProgress, targetProgress) == 0) {
setAlphas(toState, config, builder);
diff --git a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
index 43ae65175..81c95cbdd 100644
--- a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
+++ b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
@@ -53,9 +53,6 @@ public class AccessibilityManagerCompat {
}
public static void sendStateEventToTest(Context context, int stateOrdinal) {
- if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
- android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG, "sendStateEventToTest");
- }
final AccessibilityManager accessibilityManager = getAccessibilityManagerForTest(context);
if (accessibilityManager == null) return;
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index 3774042c9..d6d0577c9 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -73,10 +73,8 @@ 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_ALLAPPS_EVENT_TAG = "b/133867119";
public static final String NO_DRAG_TAG = "b/133009122";
public static final String NO_START_TAG = "b/132900132";
public static final String NO_START_TASK_TAG = "b/133765434";
public static final String NO_OVERVIEW_EVENT_TAG = "b/134532571";
- public static final String EVENTS_TO_OVERVIEW_MISSING_TAG = "b/133867119";
}
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
index 6f53140ea..7252410e0 100644
--- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
@@ -118,9 +118,6 @@ public abstract class AbstractStateChangeTouchController
@Override
public final boolean onControllerInterceptTouchEvent(MotionEvent ev) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onControllerInterceptTouchEvent 1 " + ev);
- }
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
mNoIntercept = !canInterceptTouch(ev);
if (mNoIntercept) {
@@ -150,9 +147,6 @@ public abstract class AbstractStateChangeTouchController
return false;
}
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onControllerInterceptTouchEvent 2 ");
- }
onControllerTouchEvent(ev);
return mDetector.isDraggingOrSettling();
}
@@ -240,9 +234,6 @@ public abstract class AbstractStateChangeTouchController
@Override
public void onDragStart(boolean start) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onDragStart 1 " + start);
- }
mStartState = mLauncher.getStateManager().getState();
if (mStartState == ALL_APPS) {
mStartContainerType = LauncherLogProto.ContainerType.ALLAPPS;
@@ -252,9 +243,6 @@ public abstract class AbstractStateChangeTouchController
mStartContainerType = LauncherLogProto.ContainerType.TASKSWITCHER;
}
if (mCurrentAnimation == null) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onDragStart 2");
- }
mFromState = mStartState;
mToState = null;
cancelAnimationControllers();
@@ -376,9 +364,6 @@ public abstract class AbstractStateChangeTouchController
@Override
public void onDragEnd(float velocity, boolean fling) {
- if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
- android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onDragEnd");
- }
final int logAction = fling ? Touch.FLING : Touch.SWIPE;
boolean blockedFling = fling && mFlingBlockCheck.isBlocked();
@@ -515,9 +500,6 @@ public abstract class AbstractStateChangeTouchController
}
protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
- if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
- android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onSwipeInteractionCompleted 1");
- }
if (mAtomicComponentsController != null) {
mAtomicComponentsController.getAnimationPlayer().end();
mAtomicComponentsController = null;
@@ -535,11 +517,6 @@ public abstract class AbstractStateChangeTouchController
logReachedState(logAction, targetState);
}
mLauncher.getStateManager().goToState(targetState, false /* animated */);
-
- if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
- android.util.Log.e(
- TestProtocol.NO_ALLAPPS_EVENT_TAG, "onSwipeInteractionCompleted 2");
- }
}
}
@@ -563,9 +540,6 @@ public abstract class AbstractStateChangeTouchController
}
private void cancelAnimationControllers() {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "cancelAnimationControllers");
- }
mCurrentAnimation = null;
cancelAtomicComponentsController();
mDetector.finishedScrolling();
diff --git a/src/com/android/launcher3/touch/SwipeDetector.java b/src/com/android/launcher3/touch/SwipeDetector.java
index 3d454046a..3777a41ad 100644
--- a/src/com/android/launcher3/touch/SwipeDetector.java
+++ b/src/com/android/launcher3/touch/SwipeDetector.java
@@ -158,9 +158,6 @@ public class SwipeDetector {
// SETTLING -> (View settled) -> IDLE
private void setState(ScrollState newState) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "setState -- start: " + newState);
- }
if (DBG) {
Log.d(TAG, "setState:" + mState + "->" + newState);
}
@@ -168,9 +165,6 @@ public class SwipeDetector {
if (newState == ScrollState.DRAGGING) {
initializeDragging();
if (mState == ScrollState.IDLE) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "setState -- 1: " + newState);
- }
reportDragStart(false /* recatch */);
} else if (mState == ScrollState.SETTLING) {
reportDragStart(true /* recatch */);
@@ -181,11 +175,6 @@ public class SwipeDetector {
}
mState = newState;
- if (com.android.launcher3.testing.TestProtocol.sDebugTracing) {
- android.util.Log.e(TestProtocol.NO_ALLAPPS_EVENT_TAG,
- "setState: " + newState + " @ " + android.util.Log.getStackTraceString(
- new Throwable()));
- }
}
public boolean isDraggingOrSettling() {
@@ -324,15 +313,9 @@ public class SwipeDetector {
break;
}
mDisplacement = mDir.getDisplacement(ev, pointerIndex, mDownPos, mIsRtl);
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onTouchEvent 1");
- }
// handle state and listener calls.
if (mState != ScrollState.DRAGGING && shouldScrollStart(ev, pointerIndex)) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.NO_ALLAPPS_EVENT_TAG, "onTouchEvent 2");
- }
setState(ScrollState.DRAGGING);
}
if (mState == ScrollState.DRAGGING) {
diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java
index 1e70c7f81..15f272470 100644
--- a/src/com/android/launcher3/views/BaseDragLayer.java
+++ b/src/com/android/launcher3/views/BaseDragLayer.java
@@ -152,9 +152,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
}
private TouchController findControllerToHandleTouch(MotionEvent ev) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.EVENTS_TO_OVERVIEW_MISSING_TAG, "findControllerToHandleTouch " + ev);
- }
if (shouldDisableGestures(ev)) return null;
AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mActivity);
@@ -315,9 +312,6 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext>
* Proxies the touch events to the gesture handlers
*/
public boolean proxyTouchEvent(MotionEvent ev) {
- if (TestProtocol.sDebugTracing) {
- Log.d(TestProtocol.EVENTS_TO_OVERVIEW_MISSING_TAG, "proxyTouchEvent " + ev);
- }
boolean handled;
if (mProxyTouchController != null) {
handled = mProxyTouchController.onControllerTouchEvent(ev);