diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-13 21:22:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-13 21:22:14 +0000 |
commit | ec5561060b307eeb6eda618af8d32c6b6c92bc66 (patch) | |
tree | 14efe4e8c72ab1fba072b0993c1e79d2d18c04e6 | |
parent | c0893bc33e910d694038e2d6f9cb380f1ef2c26c (diff) | |
parent | f02bef7345042405f2853746682a6e76664bc31e (diff) | |
download | android_packages_apps_Trebuchet-ec5561060b307eeb6eda618af8d32c6b6c92bc66.tar.gz android_packages_apps_Trebuchet-ec5561060b307eeb6eda618af8d32c6b6c92bc66.tar.bz2 android_packages_apps_Trebuchet-ec5561060b307eeb6eda618af8d32c6b6c92bc66.zip |
Merge "More tracing for app not starting from all apps" into ub-launcher3-qt-dev
-rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 5 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/views/BaseDragLayer.java | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 2f801e04b..7085c6052 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -32,6 +32,7 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; +import android.util.Log; import android.util.Property; import android.util.TypedValue; import android.view.KeyEvent; @@ -52,6 +53,7 @@ import com.android.launcher3.icons.DotRenderer; import com.android.launcher3.icons.IconCache.IconLoadRequest; import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver; import com.android.launcher3.model.PackageItemInfo; +import com.android.launcher3.testing.TestProtocol; import com.android.launcher3.views.ActivityContext; import java.text.NumberFormat; @@ -304,6 +306,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, @Override public boolean onTouchEvent(MotionEvent event) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_START_TAG, "BubbleTextView.onTouchEvent " + event); + } // Call the superclass onTouchEvent first, because sometimes it changes the state to // isPressed() on an ACTION_UP boolean result = super.onTouchEvent(event); diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index d68ff4451..ea9b077c6 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -26,6 +26,7 @@ import android.os.Process; import android.text.Selection; import android.text.SpannableStringBuilder; import android.util.AttributeSet; +import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -625,6 +626,9 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo @Override public boolean dispatchTouchEvent(MotionEvent ev) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_START_TAG, "AllAppsContainerView.dispatchTouchEvent " + ev); + } final boolean result = super.dispatchTouchEvent(ev); switch (ev.getActionMasked()) { case MotionEvent.ACTION_DOWN: diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index 939b0f2b9..ac152dbff 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -29,6 +29,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.os.Build; import android.util.AttributeSet; +import android.util.Log; import android.util.Property; import android.view.MotionEvent; import android.view.View; @@ -240,6 +241,9 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext> @Override public boolean dispatchTouchEvent(MotionEvent ev) { + if (TestProtocol.sDebugTracing) { + Log.d(TestProtocol.NO_START_TAG, "BaseDragLayer.dispatchTouchEvent " + ev); + } switch (ev.getAction()) { case ACTION_DOWN: { float x = ev.getX(); |