From 822efc9e82e120e7d82f170e3fd22acfd98dbe35 Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 17 Apr 2020 19:04:41 -0700 Subject: [PATCH] Remove tracing for widgets scroll bug Bug: 152354290 Change-Id: Iff56460f3f673f7089d647d08bb621c3965c7444 --- .../android/launcher3/BaseRecyclerView.java | 16 +------- .../compat/AccessibilityManagerCompat.java | 3 -- .../launcher3/testing/TestProtocol.java | 1 - .../launcher3/views/BaseDragLayer.java | 3 -- .../launcher3/widget/WidgetsFullSheet.java | 8 ---- .../launcher3/widget/WidgetsRecyclerView.java | 38 +------------------ 6 files changed, 3 insertions(+), 66 deletions(-) diff --git a/src/com/android/launcher3/BaseRecyclerView.java b/src/com/android/launcher3/BaseRecyclerView.java index 41eeb78bc7..8eceec04ec 100644 --- a/src/com/android/launcher3/BaseRecyclerView.java +++ b/src/com/android/launcher3/BaseRecyclerView.java @@ -183,10 +183,6 @@ public abstract class BaseRecyclerView extends RecyclerView { public void onScrollStateChanged(int state) { super.onScrollStateChanged(state); - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onScrollStateChanged: " + state); - } - if (state == SCROLL_STATE_IDLE) { AccessibilityManagerCompat.sendScrollFinishedEventToTest(getContext()); } @@ -196,10 +192,6 @@ public abstract class BaseRecyclerView extends RecyclerView { public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(info); if (isLayoutSuppressed()) info.setScrollable(false); - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, - "onInitializeAccessibilityNodeInfo, scrollable: " + info.isScrollable()); - } } @Override @@ -207,12 +199,8 @@ public abstract class BaseRecyclerView extends RecyclerView { final boolean changing = frozen != isLayoutSuppressed(); super.setLayoutFrozen(frozen); if (changing) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "setLayoutFrozen " + frozen - + " @ " + Log.getStackTraceString(new Throwable())); - ActivityContext.lookupContext(getContext()).getDragLayer() - .sendAccessibilityEvent(TYPE_WINDOW_CONTENT_CHANGED); - } + ActivityContext.lookupContext(getContext()).getDragLayer() + .sendAccessibilityEvent(TYPE_WINDOW_CONTENT_CHANGED); } } } \ No newline at end of file diff --git a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java index 737c97b1bc..1d32d1dfa2 100644 --- a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java +++ b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java @@ -75,9 +75,6 @@ public class AccessibilityManagerCompat { } public static void sendScrollFinishedEventToTest(Context context) { - if (TestProtocol.sDebugTracing) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "sendScrollFinishedEventToTest"); - } 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 e7449bbf67..82f2eb49b3 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -98,5 +98,4 @@ public final class TestProtocol { public static final String PERMANENT_DIAG_TAG = "TaplTarget"; public static final String APP_NOT_DISABLED = "b/139891609"; - public static final String NO_SCROLL_END_WIDGETS = "b/152354290"; } diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index 2fc3eaf317..6915953068 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -275,9 +275,6 @@ public abstract class BaseDragLayer @Override public boolean dispatchTouchEvent(MotionEvent ev) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "BaseDragLayer: " + ev); - } switch (ev.getAction()) { case ACTION_DOWN: { mTouchDispatchState |= TOUCH_DISPATCHING_VIEW; diff --git a/src/com/android/launcher3/widget/WidgetsFullSheet.java b/src/com/android/launcher3/widget/WidgetsFullSheet.java index 37a30af22a..536b766e50 100644 --- a/src/com/android/launcher3/widget/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/WidgetsFullSheet.java @@ -71,14 +71,6 @@ public class WidgetsFullSheet extends BaseWidgetSheet } - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "WidgetsFullSheet: " + ev); - } - return super.dispatchTouchEvent(ev); - } - public WidgetsFullSheet(Context context, AttributeSet attrs) { this(context, attrs, 0); } diff --git a/src/com/android/launcher3/widget/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/WidgetsRecyclerView.java index 17baa271e2..82d4110e85 100644 --- a/src/com/android/launcher3/widget/WidgetsRecyclerView.java +++ b/src/com/android/launcher3/widget/WidgetsRecyclerView.java @@ -158,23 +158,13 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch mScrollbar.isHitInParent(e.getX(), e.getY(), mFastScrollerOffset); } if (mTouchDownOnScroller) { - final boolean result = mScrollbar.handleTouchEvent(e, mFastScrollerOffset); - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onInterceptTouchEvent 1 " + result); - } - return result; - } - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onInterceptTouchEvent 2 false"); + return mScrollbar.handleTouchEvent(e, mFastScrollerOffset); } return false; } @Override public void onTouchEvent(RecyclerView rv, MotionEvent e) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "WidgetsRecyclerView.onTouchEvent"); - } if (mTouchDownOnScroller) { mScrollbar.handleTouchEvent(e, mFastScrollerOffset); } @@ -182,31 +172,5 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch @Override public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "onRequestDisallowInterceptTouchEvent " - + disallowIntercept); - } - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - final boolean result = super.dispatchTouchEvent(ev); - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "WidgetsRecyclerView: state: " - + getScrollState() - + " can scroll: " + getLayoutManager().canScrollVertically() - + " result: " + result - + " layout suppressed: " + isLayoutSuppressed() - + " event: " + ev); - } - return result; - } - - @Override - public void stopNestedScroll() { - if (Utilities.IS_RUNNING_IN_TEST_HARNESS) { - Log.d(TestProtocol.NO_SCROLL_END_WIDGETS, "stopNestedScroll"); - } - super.stopNestedScroll(); } } \ No newline at end of file