aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-17 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Adding debug tracing for a flake" into ub-launcher3-qt-qpr1-dev

Browse Source 
am: 1a02173321

Change-Id: Id1feb3f64191475472bdfceac309b6e26869a1e6
This commit is contained in:
vadimt
2019-09-28 01:07:55 -07:00
committed by android-build-merger
parent 75b713c71e 1a02173321
commit 10b1414778
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/Workspace.java
View File

@@ -1468,6 +1468,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
public DragView beginDragShared(View child, DragSource source, ItemInfo dragObject,
DragPreviewProvider previewProvider, DragOptions dragOptions) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_CONTEXT_MENU, "beginDragShared");
}
float iconScale = 1f;
if (child instanceof BubbleTextView) {
Drawable icon = ((BubbleTextView) child).getIcon();

8
src/com/android/launcher3/popup/PopupContainerWithArrow.java
View File

@@ -37,6 +37,7 @@ import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Pair;
import android.view.MotionEvent;
import android.view.View;
@@ -65,6 +66,7 @@ import com.android.launcher3.notification.NotificationKeyData;
import com.android.launcher3.popup.PopupDataProvider.PopupDataChangeListener;
import com.android.launcher3.shortcuts.DeepShortcutView;
import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
import com.android.launcher3.testing.TestProtocol;
import com.android.launcher3.touch.ItemClickHandler;
import com.android.launcher3.touch.ItemLongClickListener;
import com.android.launcher3.util.PackageUserKey;
@@ -194,6 +196,9 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
* @return the container if shown or null.
*/
public static PopupContainerWithArrow showForIcon(BubbleTextView icon) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_CONTEXT_MENU, "showForIcon");
}
Launcher launcher = Launcher.getLauncher(icon.getContext());
if (getOpen(launcher) != null) {
// There is already an items container open, so don't open this one.
@@ -235,6 +240,9 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
protected void populateAndShow(
BubbleTextView icon, ItemInfo item, SystemShortcutFactory factory) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_CONTEXT_MENU, "populateAndShow");
}
PopupDataProvider popupDataProvider = mLauncher.getPopupDataProvider();
populateAndShow(icon,
popupDataProvider.getShortcutCountForItem(item),

1
src/com/android/launcher3/testing/TestProtocol.java
View File

@@ -86,4 +86,5 @@ public final class TestProtocol {
public static final String NO_BACKGROUND_TO_OVERVIEW_TAG = "b/138251824";
public static final String NO_DRAG_TO_WORKSPACE = "b/138729456";
public static final String APP_NOT_DISABLED = "b/139891609";
public static final String NO_CONTEXT_MENU = "b/141770616";
}

13
src/com/android/launcher3/touch/ItemLongClickListener.java
View File

@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS;
import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.OVERVIEW;
import android.util.Log;
import android.view.View;
import android.view.View.OnLongClickListener;
@@ -33,6 +34,9 @@ import com.android.launcher3.Launcher;
import com.android.launcher3.dragndrop.DragController;
import com.android.launcher3.dragndrop.DragOptions;
import com.android.launcher3.folder.Folder;
import com.android.launcher3.testing.TestProtocol;
import java.util.Arrays;
/**
* Class to handle long-clicks on workspace items and start drag as a result.
@@ -75,10 +79,19 @@ public class ItemLongClickListener {
}
private static boolean onAllAppsItemLongClick(View v) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_CONTEXT_MENU, "onAllAppsItemLongClick1");
}
Launcher launcher = Launcher.getLauncher(v.getContext());
if (!canStartDrag(launcher)) return false;
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_CONTEXT_MENU, "onAllAppsItemLongClick2");
}
// When we have exited all apps or are in transition, disregard long clicks
if (!launcher.isInState(ALL_APPS) && !launcher.isInState(OVERVIEW)) return false;
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_CONTEXT_MENU, "onAllAppsItemLongClick3");
}
if (launcher.getWorkspace().isSwitchingState()) return false;
// Start the drag