summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-09-28 16:47:32 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-10-10 13:36:03 -0700
commit740ac7f00e0b847b8e392800f7948d93493e11d6 (patch)
tree4963fa6facfe75cb4165f818f4a95c62d6226ec9 /src/com/android/launcher3/Workspace.java
parentcc88b5bc94d32740e605a1795e91ad11d0664567 (diff)
downloadandroid_packages_apps_Trebuchet-740ac7f00e0b847b8e392800f7948d93493e11d6.tar.gz
android_packages_apps_Trebuchet-740ac7f00e0b847b8e392800f7948d93493e11d6.tar.bz2
android_packages_apps_Trebuchet-740ac7f00e0b847b8e392800f7948d93493e11d6.zip
Refactoring floating view opening/closing logic
> Creating a base view for floating panels with some common methods > Moving the getOpen method to individual classes > Moving the folder icon animation logic to folder icon > Moving all the logic related for opening folder to Folder class Change-Id: I898dfb6870b857cb921d2729b89618bc43ff2e88
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java24
1 files changed, 3 insertions, 21 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index e583be483..f5297358b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -553,24 +553,6 @@ public class Workspace extends PagedView
cl.getBackgroundAlpha() > 0);
}
- /**
- * @return The open folder on the current screen, or null if there is none
- */
- public Folder getOpenFolder() {
- DragLayer dragLayer = mLauncher.getDragLayer();
- // Iterate in reverse order. Folder is added later to the dragLayer,
- // and will be one of the last views.
- for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {
- View child = dragLayer.getChildAt(i);
- if (child instanceof Folder) {
- Folder folder = (Folder) child;
- if (folder.getInfo().opened)
- return folder;
- }
- }
- return null;
- }
-
boolean isTouchActive() {
return mTouchState != TOUCH_STATE_REST;
}
@@ -3811,7 +3793,7 @@ public class Workspace extends PagedView
if (!workspaceInModalState() && !mIsSwitchingState) {
super.scrollLeft();
}
- Folder openFolder = getOpenFolder();
+ Folder openFolder = Folder.getOpen(mLauncher);
if (openFolder != null) {
openFolder.completeDragExit();
}
@@ -3822,7 +3804,7 @@ public class Workspace extends PagedView
if (!workspaceInModalState() && !mIsSwitchingState) {
super.scrollRight();
}
- Folder openFolder = getOpenFolder();
+ Folder openFolder = Folder.getOpen(mLauncher);
if (openFolder != null) {
openFolder.completeDragExit();
}
@@ -3841,7 +3823,7 @@ public class Workspace extends PagedView
}
boolean result = false;
- if (!workspaceInModalState() && !mIsSwitchingState && getOpenFolder() == null) {
+ if (!workspaceInModalState() && !mIsSwitchingState && Folder.getOpen(mLauncher) == null) {
mInScrollArea = true;
final int page = getNextPage() +