Merge "Resize only one widget at a time" into ub-launcher3-master

diff --cc src/com/android/launcher3/Launcher.java
Simple merge

diff --cc src/com/android/launcher3/Workspace.java
Simple merge

diff --cc src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 1719b05,b27246a..05ee577
--- 1/src/com/android/launcher3/allapps/AllAppsTransitionController.java
--- 2/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@@ -106,10 -106,10 +106,10 @@@ public class AllAppsTransitionControlle
      }
  
      @Override
-     public boolean onInterceptTouchEvent(MotionEvent ev) {
+     public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
          if (ev.getAction() == MotionEvent.ACTION_DOWN) {
              mNoIntercept = false;
 -            if (mLauncher.getWorkspace().isInOverviewMode() || mLauncher.isWidgetsViewVisible()) {
 +            if (!mLauncher.isAllAppsVisible() && mLauncher.getWorkspace().workspaceInModalState()) {
                  mNoIntercept = true;
              } else if (mLauncher.isAllAppsVisible() &&
                      !mAppsView.shouldContainerScroll(ev)) {

diff --cc src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
Simple merge