import com.android.launcher3.DeviceProfile;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.R;
-import com.android.launcher3.Utilities;
import com.android.launcher3.logging.UserEventDispatcher.LaunchSourceProvider;
import com.android.launcher3.userevent.nano.LauncherLogProto;
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
+
import java.util.List;
/**
@Override
public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ targetParent.containerType = getContainerType(v);
+ }
+
+ public int getContainerType(View v) {
if (mApps.hasFilter()) {
- targetParent.containerType = LauncherLogProto.SEARCHRESULT;
+ return LauncherLogProto.SEARCHRESULT;
} else {
if (v instanceof BubbleTextView) {
BubbleTextView icon = (BubbleTextView) v;
List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems();
AlphabeticalAppsList.AdapterItem item = items.get(position);
if (item.viewType == AllAppsGridAdapter.VIEW_TYPE_PREDICTION_ICON) {
- targetParent.containerType = LauncherLogProto.PREDICTION;
- return;
+ return LauncherLogProto.PREDICTION;
}
}
}
-
- targetParent.containerType = LauncherLogProto.ALLAPPS;
+ return LauncherLogProto.ALLAPPS;
}
}
public void run() {
mContent.setLayerType(LAYER_TYPE_NONE, null);
mFooter.setLayerType(LAYER_TYPE_NONE, null);
+ mLauncher.getUserEventDispatcher().resetElapsedContainerMillis();
}
};
}
case LauncherLogProto.APP_ICON: typeStr = "ICON"; break;
case LauncherLogProto.SHORTCUT: typeStr = "SHORTCUT"; break;
case LauncherLogProto.WIDGET: typeStr = "WIDGET"; break;
+ case LauncherLogProto.DEEPSHORTCUT: typeStr = "DEEPSHORTCUT"; break;
default: typeStr = "UNKNOWN";
}
case LauncherLogProto.SEARCHRESULT:
str = "SEARCHRESULT";
break;
+ case LauncherLogProto.DEEPSHORTCUTS:
+ str = "DEEPSHORTCUTS";
+ break;
default:
str = "UNKNOWN";
}
import android.view.ViewParent;
import com.android.launcher3.ItemInfo;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
dispatchUserEvent(event, null);
}
+ public void logDeepShortcutsOpen(int containerType) {
+ LauncherEvent event = LoggerUtils.initLauncherEvent(
+ Action.TOUCH, Target.ITEM, Target.CONTAINER);
+ event.action.touch = Action.LONGPRESS;
+ event.srcTarget[0].itemType = LauncherLogProto.DEEPSHORTCUT;
+ event.srcTarget[1].containerType = containerType;
+ event.elapsedContainerMillis = System.currentTimeMillis() - mElapsedContainerMillis;
+ event.elapsedSessionMillis = System.currentTimeMillis() - mElapsedSessionMillis;
+ dispatchUserEvent(event, null);
+ }
+
public void logDragNDrop() {
// TODO
}
public void dispatchUserEvent(LauncherEvent ev, Intent intent) {
if (DEBUG_LOGGING) {
- Log.d("UserEvent", String.format(Locale.US,
+ Log.d(TAG, String.format(Locale.US,
"action:%s\nchild:%s\nparent:%s\nelapsed container %d ms session %d ms",
LoggerUtils.getActionStr(ev.action),
LoggerUtils.getTargetStr(ev.srcTarget != null ? ev.srcTarget[0] : null),
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
import android.graphics.drawable.ShapeDrawable;
import android.os.Build;
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;
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.LogAccelerateInterpolator;
import com.android.launcher3.R;
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;
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.
*/