commit 24a667c5566785dfcff53244a787443dad456f5e
author Michael Jurka <mikejurka@google.com> Tue Oct 11 16:08:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 11 16:08:35 2011 -0700
tree af5d5557ba10940f5931ac1432568eaf723013d3
parent c1f5d26675e9777a55076d41404208e6160ca483
parent 2a55232840acc214d95474a3734b3b897669efd9

Merge "Add haptic feedback when All Apps button is pressed" into ics-mr0

src/com/android/launcher2/Hotseat.java

diff --git a/src/com/android/launcher2/Hotseat.java b/src/com/android/launcher2/Hotseat.java
index 85412c6..f1fb6ab 100644
--- a/src/com/android/launcher2/Hotseat.java
+++ b/src/com/android/launcher2/Hotseat.java
@@ -107,7 +107,7 @@
             @Override
             public void onClick(android.view.View v) {
                 if (mLauncher != null) {
-                    mLauncher.showAllApps(true);
+                    mLauncher.onClickAllAppsButton(v);
                 }
             }
         });

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 4ae23a3..6d95555 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1688,7 +1688,7 @@
             if (mState == State.APPS_CUSTOMIZE) {
                 showWorkspace(true);
             } else {
-                showAllApps(true);
+                onClickAllAppsButton(v);
             }
         }
     }
@@ -1731,6 +1731,8 @@
      * @param v The view that was clicked.
      */
     public void onClickAllAppsButton(View v) {
+        // Provide the same haptic feedback that the system offers for virtual keys.
+        v.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
         showAllApps(true);
     }