PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Removing tracing for a fixed bug" into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-29 00:32:31 +00:00
committed by Android (Google) Code Review
parent 70d7860eae 5631b4a7ef
commit bec28445ea
4 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
-3
View File
@@ -1471,9 +1471,6 @@ 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();
src/com/android/launcher3/popup/PopupContainerWithArrow.java
-6
View File
@@ -197,9 +197,6 @@ 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.
@@ -240,9 +237,6 @@ public class PopupContainerWithArrow extends ArrowPopup implements DragSource,
}
protected void populateAndShow(BubbleTextView icon, ItemInfo item) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_CONTEXT_MENU, "populateAndShow");
}
PopupDataProvider popupDataProvider = mLauncher.getPopupDataProvider();
populateAndShow(icon,
popupDataProvider.getShortcutCountForItem(item),
src/com/android/launcher3/testing/TestProtocol.java
-1
View File
@@ -84,6 +84,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";
public static final String CRASH_ADD_CUSTOM_SHORTCUT = "b/141568904";
}
src/com/android/launcher3/touch/ItemLongClickListener.java
-9
View File
@@ -79,19 +79,10 @@ 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