commit efe354b8779211b34e274a6109406d4cd01cfcef
author Tom Stamm <stammt@google.com> Tue Jun 11 22:23:47 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 11 22:23:48 2013 +0000
tree 406d21189bde9bc56f584e8370dde6bea2e63df9
parent 69688aa359cdbffce4decf334f5d6f0143e3a694
parent 66a01fd24bde7c94ea892b007df7f79fbaa43d80

Merge "Add API to launcher to insert a custom page to the left of workspace" into jb-ub-gel-agar

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 25b1fd4..8e8e6ed 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2075,7 +2075,9 @@
     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;
     }
 
@@ -2926,10 +2928,10 @@
         getWindow().getDecorView()
                 .sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
 
-        onWorkspaceShown();
+        onWorkspaceShown(animated);
     }
 
-    public void onWorkspaceShown() {
+    public void onWorkspaceShown(boolean animated) {
     }
 
     void showAllApps(boolean animated) {