summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@google.com>2013-06-11 20:26:38 +0100
committerBjorn Bringert <bringert@google.com>2013-06-11 20:40:55 +0100
commit69688aa359cdbffce4decf334f5d6f0143e3a694 (patch)
tree818885a2634af36d3acb4e558e85e993bdf0009f
parentecf33e4819d0c4b019706edd456ed14a6a0f200c (diff)
downloadandroid_packages_apps_Trebuchet-69688aa359cdbffce4decf334f5d6f0143e3a694.tar.gz
android_packages_apps_Trebuchet-69688aa359cdbffce4decf334f5d6f0143e3a694.tar.bz2
android_packages_apps_Trebuchet-69688aa359cdbffce4decf334f5d6f0143e3a694.zip
Add 'animated' argument to onWorkspaceShown; only call it on touch down
This lets subclasses decide whether to animate hiding of their own overlays etc. Change-Id: I0b34953c53cd0beb0fb33329d919f78f671b660a
-rw-r--r--src/com/android/launcher3/Launcher.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index bb264d60a..2f1c8f0fc 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2047,7 +2047,9 @@ public class Launcher extends Activity
public boolean onTouch(View v, MotionEvent event) {
// this is an intercepted event being forwarded from mWorkspace;
// clicking anywhere on the workspace causes the customization drawer to slide down
- showWorkspace(true);
+ if (event.getAction() == MotionEvent.ACTION_DOWN) {
+ showWorkspace(true);
+ }
return false;
}
@@ -2898,10 +2900,10 @@ public class Launcher extends Activity
getWindow().getDecorView()
.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
- onWorkspaceShown();
+ onWorkspaceShown(animated);
}
- public void onWorkspaceShown() {
+ public void onWorkspaceShown(boolean animated) {
}
void showAllApps(boolean animated) {