Remove special code path for not animating folder open in power save mode
-> framework takes care of this
-> stripped unused code
Change-Id: If1941447df5c3145db715971440b80bd754f0bb1
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ba5ec51..ccab1a3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2727,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) {
@@ -3002,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) {
@@ -3022,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) {
@@ -3064,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;
@@ -3090,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
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);
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);
}
};