Merge "Logging for drop bar not appearing for dragged widget" into sc-v2-dev (6bad4d88) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/DropTargetBar.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import android.animation.TimeInterpolator;
	import android.content.Context;		import android.content.Context;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.util.AttributeSet;		import android.util.AttributeSet;
			import android.util.Log;
	import android.util.TypedValue;		import android.util.TypedValue;
	import android.view.Gravity;		import android.view.Gravity;
	import android.view.View;		import android.view.View;
	@@ -32,10 +33,13 @@ import android.view.ViewDebug;
	import android.view.ViewPropertyAnimator;		import android.view.ViewPropertyAnimator;
	import android.widget.FrameLayout;		import android.widget.FrameLayout;

			import androidx.annotation.NonNull;

	import com.android.launcher3.anim.Interpolators;		import com.android.launcher3.anim.Interpolators;
	import com.android.launcher3.dragndrop.DragController;		import com.android.launcher3.dragndrop.DragController;
	import com.android.launcher3.dragndrop.DragController.DragListener;		import com.android.launcher3.dragndrop.DragController.DragListener;
	import com.android.launcher3.dragndrop.DragOptions;		import com.android.launcher3.dragndrop.DragOptions;
			import com.android.launcher3.testing.TestProtocol;

	/*		/*
	* The top bar containing various drop targets: Delete/App Info/Uninstall.		* The top bar containing various drop targets: Delete/App Info/Uninstall.
	@@ -212,6 +216,9 @@ public class DropTargetBar extends FrameLayout
	}		}

	public void animateToVisibility(boolean isVisible) {		public void animateToVisibility(boolean isVisible) {
			if (TestProtocol.sDebugTracing) {
			Log.d(TestProtocol.NO_DROP_TARGET, "8");
			}
	if (mVisible != isVisible) {		if (mVisible != isVisible) {
	mVisible = isVisible;		mVisible = isVisible;

	@@ -238,6 +245,9 @@ public class DropTargetBar extends FrameLayout
	*/		*/
	@Override		@Override
	public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {		public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) {
			if (TestProtocol.sDebugTracing) {
			Log.d(TestProtocol.NO_DROP_TARGET, "7");
			}
	animateToVisibility(true);		animateToVisibility(true);
	}		}

	@@ -261,4 +271,12 @@ public class DropTargetBar extends FrameLayout
	public ButtonDropTarget[] getDropTargets() {		public ButtonDropTarget[] getDropTargets() {
	return mDropTargets;		return mDropTargets;
	}		}

			@Override
			protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
			super.onVisibilityChanged(changedView, visibility);
			if (TestProtocol.sDebugTracing && visibility == VISIBLE) {
			Log.d(TestProtocol.NO_DROP_TARGET, "9");
			}
			}
	}		}

src/com/android/launcher3/dragndrop/DragController.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.content.ComponentName;
	import android.graphics.Point;		import android.graphics.Point;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
			import android.util.Log;
	import android.view.DragEvent;		import android.view.DragEvent;
	import android.view.KeyEvent;		import android.view.KeyEvent;
	import android.view.MotionEvent;		import android.view.MotionEvent;
	@@ -34,6 +35,7 @@ import com.android.launcher3.DropTarget;
	import com.android.launcher3.logging.InstanceId;		import com.android.launcher3.logging.InstanceId;
	import com.android.launcher3.model.data.ItemInfo;		import com.android.launcher3.model.data.ItemInfo;
	import com.android.launcher3.model.data.WorkspaceItemInfo;		import com.android.launcher3.model.data.WorkspaceItemInfo;
			import com.android.launcher3.testing.TestProtocol;
	import com.android.launcher3.util.ItemInfoMatcher;		import com.android.launcher3.util.ItemInfoMatcher;
	import com.android.launcher3.util.TouchController;		import com.android.launcher3.util.TouchController;
	import com.android.launcher3.views.ActivityContext;		import com.android.launcher3.views.ActivityContext;
	@@ -146,6 +148,9 @@ public abstract class DragController<T extends ActivityContext>
	float initialDragViewScale,		float initialDragViewScale,
	float dragViewScaleOnDrop,		float dragViewScaleOnDrop,
	DragOptions options) {		DragOptions options) {
			if (TestProtocol.sDebugTracing) {
			Log.d(TestProtocol.NO_DROP_TARGET, "4");
			}
	return startDrag(drawable, /* view= */ null, originalView, dragLayerX, dragLayerY,		return startDrag(drawable, /* view= */ null, originalView, dragLayerX, dragLayerY,
	source, dragInfo, dragOffset, dragRegion, initialDragViewScale, dragViewScaleOnDrop,		source, dragInfo, dragOffset, dragRegion, initialDragViewScale, dragViewScaleOnDrop,
	options);		options);
	@@ -203,6 +208,9 @@ public abstract class DragController<T extends ActivityContext>
	DragOptions options);		DragOptions options);

	protected void callOnDragStart() {		protected void callOnDragStart() {
			if (TestProtocol.sDebugTracing) {
			Log.d(TestProtocol.NO_DROP_TARGET, "6");
			}
	if (mOptions.preDragCondition != null) {		if (mOptions.preDragCondition != null) {
	mOptions.preDragCondition.onPreDragEnd(mDragObject, true /* dragStarted*/);		mOptions.preDragCondition.onPreDragEnd(mDragObject, true /* dragStarted*/);
	}		}

src/com/android/launcher3/dragndrop/LauncherDragController.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import android.content.res.Resources;
	import android.graphics.Point;		import android.graphics.Point;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
			import android.util.Log;
	import android.view.HapticFeedbackConstants;		import android.view.HapticFeedbackConstants;
	import android.view.View;		import android.view.View;

	@@ -36,6 +37,7 @@ import com.android.launcher3.Launcher;
	import com.android.launcher3.R;		import com.android.launcher3.R;
	import com.android.launcher3.accessibility.DragViewStateAnnouncer;		import com.android.launcher3.accessibility.DragViewStateAnnouncer;
	import com.android.launcher3.model.data.ItemInfo;		import com.android.launcher3.model.data.ItemInfo;
			import com.android.launcher3.testing.TestProtocol;

	/**		/**
	* Drag controller for Launcher activity		* Drag controller for Launcher activity
	@@ -65,6 +67,9 @@ public class LauncherDragController extends DragController<Launcher> {
	float initialDragViewScale,		float initialDragViewScale,
	float dragViewScaleOnDrop,		float dragViewScaleOnDrop,
	DragOptions options) {		DragOptions options) {
			if (TestProtocol.sDebugTracing) {
			Log.d(TestProtocol.NO_DROP_TARGET, "5");
			}
	if (PROFILE_DRAWING_DURING_DRAG) {		if (PROFILE_DRAWING_DURING_DRAG) {
	android.os.Debug.startMethodTracing("Launcher");		android.os.Debug.startMethodTracing("Launcher");
	}		}

src/com/android/launcher3/testing/TestProtocol.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -119,4 +119,5 @@ public final class TestProtocol {
	public static final String FALLBACK_ACTIVITY_NO_SET = "b/181019015";		public static final String FALLBACK_ACTIVITY_NO_SET = "b/181019015";
	public static final String TASK_VIEW_ID_CRASH = "b/195430732";		public static final String TASK_VIEW_ID_CRASH = "b/195430732";
	public static final String L3_SWIPE_TO_HOME = "b/192018189";		public static final String L3_SWIPE_TO_HOME = "b/192018189";
			public static final String NO_DROP_TARGET = "b/195031154";
	}		}

src/com/android/launcher3/widget/BaseWidgetSheet.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ import android.content.Context;
	import android.graphics.Point;		import android.graphics.Point;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.util.AttributeSet;		import android.util.AttributeSet;
			import android.util.Log;
	import android.view.View;		import android.view.View;
	import android.view.View.OnClickListener;		import android.view.View.OnClickListener;
	import android.view.View.OnLongClickListener;		import android.view.View.OnLongClickListener;
	@@ -108,6 +109,9 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>

	@Override		@Override
	public boolean onLongClick(View v) {		public boolean onLongClick(View v) {
			if (TestProtocol.sDebugTracing) {
			Log.d(TestProtocol.NO_DROP_TARGET, "1");
			}
	TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "Widgets.onLongClick");		TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "Widgets.onLongClick");
	v.cancelLongPress();		v.cancelLongPress();
	if (!ItemLongClickListener.canStartDrag(mActivityContext)) return false;		if (!ItemLongClickListener.canStartDrag(mActivityContext)) return false;
	@@ -178,6 +182,9 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<Launcher>
	}		}

	private boolean beginDraggingWidget(WidgetCell v) {		private boolean beginDraggingWidget(WidgetCell v) {
			if (TestProtocol.sDebugTracing) {
			Log.d(TestProtocol.NO_DROP_TARGET, "2");
			}
	// Get the widget preview as the drag representation		// Get the widget preview as the drag representation
	WidgetImageView image = v.getWidgetView();		WidgetImageView image = v.getWidgetView();