diff options
author | Tony Wickham <twickham@google.com> | 2016-08-12 20:36:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 20:36:40 +0000 |
commit | d8f951f923caaa1272959acfe4957475b48ac6f5 (patch) | |
tree | 30d42ca3b3128117c345bc5cb002cee76d74d042 /src/com | |
parent | 9e22de7cb3a770ac99b9ee6fe2e52d7e3252a97a (diff) | |
parent | be06874c8105cf1beec8171235600da9f4ee035e (diff) | |
download | android_packages_apps_Trebuchet-d8f951f923caaa1272959acfe4957475b48ac6f5.tar.gz android_packages_apps_Trebuchet-d8f951f923caaa1272959acfe4957475b48ac6f5.tar.bz2 android_packages_apps_Trebuchet-d8f951f923caaa1272959acfe4957475b48ac6f5.zip |
Log shortcuts open on ACTION_UP instead of in showForIcon().
am: be06874c81
Change-Id: Iefc3b03644c2c197f0b744bb9f42fd3058624377
Diffstat (limited to 'src/com')
3 files changed, 10 insertions, 36 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java index 09076b3f9..25ed3b8ec 100644 --- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java +++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java @@ -209,12 +209,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView @Override public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) { - targetParent.containerType = getContainerType(v); - } - - public int getContainerType(View v) { if (mApps.hasFilter()) { - return LauncherLogProto.SEARCHRESULT; + targetParent.containerType = LauncherLogProto.SEARCHRESULT; } else { if (v instanceof BubbleTextView) { BubbleTextView icon = (BubbleTextView) v; @@ -223,11 +219,12 @@ public class AllAppsRecyclerView extends BaseRecyclerView List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems(); AlphabeticalAppsList.AdapterItem item = items.get(position); if (item.viewType == AllAppsGridAdapter.VIEW_TYPE_PREDICTION_ICON) { - return LauncherLogProto.PREDICTION; + targetParent.containerType = LauncherLogProto.PREDICTION; + return; } } } - return LauncherLogProto.ALLAPPS; + targetParent.containerType = LauncherLogProto.ALLAPPS; } } diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index e780cc91b..64a5f573d 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -147,12 +147,14 @@ public class UserEventDispatcher { dispatchUserEvent(event, null); } - public void logDeepShortcutsOpen(int containerType) { + public void logDeepShortcutsOpen(View icon) { LauncherEvent event = LoggerUtils.initLauncherEvent( Action.TOUCH, Target.ITEM, Target.CONTAINER); - event.action.touch = Action.LONGPRESS; + LaunchSourceProvider provider = getLaunchProviderRecursive(icon); + ItemInfo info = (ItemInfo) icon.getTag(); + provider.fillInLaunchSourceData(icon, info, event.srcTarget[0], event.srcTarget[1]); event.srcTarget[0].itemType = LauncherLogProto.DEEPSHORTCUT; - event.srcTarget[1].containerType = containerType; + event.action.touch = Action.LONGPRESS; event.elapsedContainerMillis = System.currentTimeMillis() - mElapsedContainerMillis; event.elapsedSessionMillis = System.currentTimeMillis() - mElapsedSessionMillis; dispatchUserEvent(event, null); diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java index 2542df6a2..cfeccfc1a 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java @@ -33,7 +33,6 @@ import android.os.Handler; import android.os.Looper; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.Gravity; import android.view.HapticFeedbackConstants; import android.view.LayoutInflater; @@ -54,19 +53,16 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAnimUtils; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; -import com.android.launcher3.LauncherSettings; import com.android.launcher3.LauncherViewPropertyAnimator; import com.android.launcher3.R; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.accessibility.ShortcutMenuAccessibilityDelegate; -import com.android.launcher3.allapps.AllAppsRecyclerView; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragView; -import com.android.launcher3.folder.Folder; import com.android.launcher3.graphics.TriangleShape; import com.android.launcher3.logging.UserEventDispatcher; import com.android.launcher3.userevent.nano.LauncherLogProto; @@ -479,6 +475,7 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC } } else if (action == MotionEvent.ACTION_UP) { cleanupDeferredDrag(true); + mLauncher.getUserEventDispatcher().logDeepShortcutsOpen(mDeferredDragIcon); } else if (action == MotionEvent.ACTION_CANCEL) { // Do not change the source icon visibility if we are already dragging the source icon. cleanupDeferredDrag(!mSrcIconDragStarted); @@ -749,33 +746,11 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC container.populateAndShow(icon, ids); icon.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); - logOpen(launcher, icon); return container; } return null; } - private static void logOpen(Launcher launcher, View icon) { - ItemInfo info = (ItemInfo) icon.getTag(); - long iconContainer = info.container; - Folder openFolder = launcher.getWorkspace().getOpenFolder(); - int containerType; - if (iconContainer == LauncherSettings.Favorites.CONTAINER_DESKTOP) { - containerType = LauncherLogProto.WORKSPACE; - } else if (iconContainer == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { - containerType = LauncherLogProto.HOTSEAT; - } else if (openFolder != null && iconContainer == openFolder.getInfo().id) { - containerType = LauncherLogProto.FOLDER; - } else if (icon.getParent() instanceof AllAppsRecyclerView) { - containerType = ((AllAppsRecyclerView) icon.getParent()).getContainerType(icon); - } else { - // This should not happen. - Log.w(TAG, "Couldn't determine parent of shortcut container"); - containerType = LauncherLogProto.DEFAULT_CONTAINERTYPE; - } - launcher.getUserEventDispatcher().logDeepShortcutsOpen(containerType); - } - /** * Extension of {@link ShortcutInfo} which does not badge the icons. */ |