Merge changes I6bf48141,I77b7a2e4 into sc-v2-dev

* changes:
  Taskbar drag starts internal pre-drag before system drag
  Let DragView use ActivityContext instead of Launcher
This commit is contained in:
Tony Wickham authored and Android (Google) Code Review committed 2021-05-26 17:13:49 +00:00
commit f262591ab0
18 files changed
+512 -190

No files matched your search

@@ -403,7 +403,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
}
}
void clearPressedBackground() {
public void clearPressedBackground() {
setPressed(false);
setStayPressed(false);
}
@@ -849,8 +849,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
switch (display) {
case DISPLAY_ALL_APPS:
return grid.allAppsIconSizePx;
case DISPLAY_WORKSPACE:
case DISPLAY_FOLDER:
return grid.folderChildIconSizePx;
case DISPLAY_WORKSPACE:
default:
return grid.iconSizePx;
}