summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Hotseat.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-10-13 04:55:35 -0700
committerMichael Jurka <mikejurka@google.com>2011-10-13 05:05:37 -0700
commit5130e401a005fcf6afba6e8e72a628fc45f9a287 (patch)
tree9159c441d9038a0aa5b29b239f032ad62d513bbe /src/com/android/launcher2/Hotseat.java
parent3f74f0cbc63a1ee264b49d5ca88954ea294b366b (diff)
downloadandroid_packages_apps_Trebuchet-5130e401a005fcf6afba6e8e72a628fc45f9a287.tar.gz
android_packages_apps_Trebuchet-5130e401a005fcf6afba6e8e72a628fc45f9a287.tar.bz2
android_packages_apps_Trebuchet-5130e401a005fcf6afba6e8e72a628fc45f9a287.zip
Move haptic feedback on All Apps button to touch down
Bug #5453040 - Also fixing one case where db cursor wasn't closed Bug #5453040 Change-Id: Id5e8f3c30690160900a6be2cd60c1062ff48ee54
Diffstat (limited to 'src/com/android/launcher2/Hotseat.java')
-rw-r--r--src/com/android/launcher2/Hotseat.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Hotseat.java b/src/com/android/launcher2/Hotseat.java
index f1fb6ab1c..f7fa38007 100644
--- a/src/com/android/launcher2/Hotseat.java
+++ b/src/com/android/launcher2/Hotseat.java
@@ -21,6 +21,7 @@ import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.view.LayoutInflater;
+import android.view.MotionEvent;
import android.view.View;
import android.widget.FrameLayout;
@@ -103,6 +104,17 @@ public class Hotseat extends FrameLayout {
context.getResources().getDrawable(R.drawable.all_apps_button_icon), null, null);
// allAppsButton.setText(context.getString(R.string.all_apps_button_label));
allAppsButton.setContentDescription(context.getString(R.string.all_apps_button_label));
+ allAppsButton.setOnTouchListener(new View.OnTouchListener() {
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ if (mLauncher != null &&
+ (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) {
+ mLauncher.onTouchDownAllAppsButton(v);
+ }
+ return false;
+ }
+ });
+
allAppsButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(android.view.View v) {