diff options
author | Michael Jurka <mikejurka@google.com> | 2011-10-13 12:43:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-13 12:43:13 -0700 |
commit | 2dcda1f72c4f09578d13b20890aa146f961e2ee7 (patch) | |
tree | 289b81911ffd8270c89197ea1cce8a41e1a91a82 /src/com/android/launcher2 | |
parent | 8193f690c2b7115ec8441f7374d4e10ec8d9be09 (diff) | |
parent | 5130e401a005fcf6afba6e8e72a628fc45f9a287 (diff) | |
download | android_packages_apps_Trebuchet-2dcda1f72c4f09578d13b20890aa146f961e2ee7.tar.gz android_packages_apps_Trebuchet-2dcda1f72c4f09578d13b20890aa146f961e2ee7.tar.bz2 android_packages_apps_Trebuchet-2dcda1f72c4f09578d13b20890aa146f961e2ee7.zip |
am 5130e401: Move haptic feedback on All Apps button to touch down
* commit '5130e401a005fcf6afba6e8e72a628fc45f9a287':
Move haptic feedback on All Apps button to touch down
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Hotseat.java | 12 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 20 | ||||
-rw-r--r-- | src/com/android/launcher2/LauncherProvider.java | 3 |
3 files changed, 32 insertions, 3 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) { diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 8aa57bb09..0ed512909 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -749,8 +749,19 @@ public final class Launcher extends Activity mAppsCustomizeTabHost.findViewById(R.id.apps_customize_pane_content); mAppsCustomizeContent.setup(this, dragController); - - + // Get the all apps button + mAllAppsButton = findViewById(R.id.all_apps_button); + if (mAllAppsButton != null) { + mAllAppsButton.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) { + onTouchDownAllAppsButton(v); + } + return false; + } + }); + } // Setup the drag controller (drop targets have to be added in reverse order in priority) dragController.setDragScoller(mWorkspace); dragController.setScrollView(mDragLayer); @@ -1731,9 +1742,12 @@ public final class Launcher extends Activity * @param v The view that was clicked. */ public void onClickAllAppsButton(View v) { + showAllApps(true); + } + + public void onTouchDownAllAppsButton(View v) { // Provide the same haptic feedback that the system offers for virtual keys. v.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY); - showAllApps(true); } public void onClickAppMarketButton(View v) { diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher2/LauncherProvider.java index 53f7b428b..6cec101ab 100644 --- a/src/com/android/launcher2/LauncherProvider.java +++ b/src/com/android/launcher2/LauncherProvider.java @@ -602,6 +602,9 @@ public class LauncherProvider extends ContentProvider { if (c != null && c.moveToNext()) { id = c.getLong(maxIdIndex); } + if (c != null) { + c.close(); + } if (id == -1) { throw new RuntimeException("Error: could not query max id"); |