diff options
author | Mohammadinamul Sheik <inamul@google.com> | 2014-03-18 20:32:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-18 20:32:38 +0000 |
commit | 7b763d01b20c453899948f902e795dc01a9f11f2 (patch) | |
tree | c4813a2b64f6a0511ca15d2bc323488f1f8f9a13 | |
parent | 1d719c11fb71b2b4d46be821b096242697103624 (diff) | |
parent | e769d1681e1177b9e37c0be9e12d1ede55d4e3a9 (diff) | |
download | android_packages_apps_Trebuchet-7b763d01b20c453899948f902e795dc01a9f11f2.tar.gz android_packages_apps_Trebuchet-7b763d01b20c453899948f902e795dc01a9f11f2.tar.bz2 android_packages_apps_Trebuchet-7b763d01b20c453899948f902e795dc01a9f11f2.zip |
am e769d168: Merge "Add onClickPagedViewIcon to the Launcher." into ub-now-mister-ugly
* commit 'e769d1681e1177b9e37c0be9e12d1ede55d4e3a9':
Add onClickPagedViewIcon to the Launcher.
-rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 251ae2108..e5e1580ee 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -511,8 +511,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen if (mPressedIcon != null) { mPressedIcon.lockDrawableState(); } - mLauncher.startActivitySafely(v, appInfo.intent, appInfo); - mLauncher.getStats().recordLaunch(appInfo.intent); + mLauncher.onClickPagedViewIcon(v, appInfo); } else if (v instanceof PagedViewWidget) { // Let the user know that they have to long press to add a widget if (mWidgetInstructionToast != null) { diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2d1d2f6ed..05be4ae67 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2447,6 +2447,17 @@ public class Launcher extends Activity } /** + * Event handler for a paged view icon click. + * @param v The view that was clicked. + * @param appInfo The {link AppInfo} of the view. + */ + public void onClickPagedViewIcon(View v, AppInfo appInfo) { + if (LOGD) Log.d(TAG, "onClickPagedViewIcon"); + startActivitySafely(v, appInfo.intent, appInfo); + getStats().recordLaunch(appInfo.intent); + } + + /** * Event handler for an app shortcut click. * * @param v The view that was clicked. Must be a tagged with a {@link ShortcutInfo}. |