commit fdcbe306f13c41b183689a5410dc7ba859ff1a07
author Sunny Goyal <sunnygoyal@google.com> Sat Apr 09 00:12:20 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 09 00:12:20 2016 +0000
tree 52fa30545b9bcc176c565c8a8011ea74bbe09646
parent 2bcffdcd851543339f8fe00b2e02164eb9be4a35
parent 15cece99b0a2cf63e6c4f5dc5564420f597421fe

Merge "Fixing gradle version comflicts" into ub-launcher3-calgary

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 445831c..ccab1a3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -963,6 +963,9 @@
     protected void onStop() {
         super.onStop();
         FirstFrameAnimatorHelper.setIsVisible(false);
+        if (Utilities.isNycOrAbove()) {
+            mAppWidgetHost.stopListening();
+        }
 
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onStop();
@@ -973,6 +976,9 @@
     protected void onStart() {
         super.onStart();
         FirstFrameAnimatorHelper.setIsVisible(true);
+        if (Utilities.isNycOrAbove()) {
+            mAppWidgetHost.startListening();
+        }
 
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onStart();
@@ -2721,7 +2727,7 @@
         FolderIcon folderIcon = (FolderIcon) v;
         if (!folderIcon.getFolderInfo().opened && !folderIcon.getFolder().isDestroyed()) {
             // Open the requested folder
-            openFolder(folderIcon, true);
+            openFolder(folderIcon);
         }
 
         if (mLauncherCallbacks != null) {
@@ -2996,7 +3002,7 @@
         }
     }
 
-    private void growAndFadeOutFolderIcon(FolderIcon fi, boolean animate) {
+    private void growAndFadeOutFolderIcon(FolderIcon fi) {
         if (fi == null) return;
         FolderInfo info = (FolderInfo) fi.getTag();
         if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
@@ -3016,9 +3022,6 @@
         }
         oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration));
         oa.start();
-        if (!animate) {
-            oa.end();
-        }
     }
 
     private void shrinkAndFadeInFolderIcon(final FolderIcon fi, boolean animate) {
@@ -3058,8 +3061,7 @@
      *
      * @param folderIcon The FolderIcon describing the folder to open.
      */
-    public void openFolder(FolderIcon folderIcon, boolean animate) {
-        animate &= !Utilities.isPowerSaverOn(this);
+    public void openFolder(FolderIcon folderIcon) {
 
         Folder folder = folderIcon.getFolder();
         Folder openFolder = mWorkspace != null ? mWorkspace.getOpenFolder() : null;
@@ -3084,12 +3086,9 @@
             Log.w(TAG, "Opening folder (" + folder + ") which already has a parent (" +
                     folder.getParent() + ").");
         }
-        if (animate) {
-            folder.animateOpen();
-        } else {
-            folder.open();
-        }
-        growAndFadeOutFolderIcon(folderIcon, animate);
+        folder.animateOpen();
+
+        growAndFadeOutFolderIcon(folderIcon);
 
         // Notify the accessibility manager that this folder "window" has appeared and occluded
         // the workspace items

src/com/android/launcher3/LauncherAppWidgetHost.java

diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java
index 8c23ff3..1510558 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHost.java
@@ -82,12 +82,6 @@
         }
     }
 
-    @Override
-    public void stopListening() {
-        super.stopListening();
-        clearViews();
-    }
-
     public void addProviderChangeListener(Runnable callback) {
         mProviderChangeListeners.add(callback);
     }

src/com/android/launcher3/folder/Folder.java

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 09a92a9..2b34a79 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -644,29 +644,6 @@
         mContent.verifyVisibleHighResIcons(mContent.getNextPage());
     }
 
-    /**
-     * Opens the folder without any animation
-     */
-    public void open() {
-        if (!(getParent() instanceof DragLayer)) return;
-
-        mContent.completePendingPageChanges();
-        if (!mDragInProgress) {
-            // Open on the first page.
-            mContent.snapToPageImmediately(0);
-        }
-        centerAboutIcon();
-        mFolderName.setTranslationX(0);
-        mContent.setMarkerScale(1);
-
-        // Make sure the folder picks up the last drag move even if the finger doesn't move.
-        if (mDragController.isDragging()) {
-            mDragController.forceTouchMove();
-        }
-
-        mContent.verifyVisibleHighResIcons(mContent.getNextPage());
-    }
-
     public void beginExternalDrag(ShortcutInfo item) {
         mCurrentDragInfo = item;
         mEmptyCellRank = mContent.allocateRankForNewItem(item);

src/com/android/launcher3/folder/FolderIcon.java

diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index d76608a..1e4eb7f 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -258,7 +258,7 @@
                 item = (ShortcutInfo) mDragInfo;
             }
             mFolder.beginExternalDrag(item);
-            mLauncher.openFolder(FolderIcon.this, true);
+            mLauncher.openFolder(FolderIcon.this);
         }
     };