Merge "Fix double logging for wallpaper settings icon activation" into ub-launcher3-rvc-dev (1fdc6ce4) · Commits · e / os / BlissLauncher3

protos/launcher_atom.proto

+6 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ message ContainerInfo {
		PredictionContainer prediction_container = 6;
		SearchResultContainer search_result_container = 7;
		ShortcutsContainer shortcuts_container = 8;
		SettingsContainer settings_container = 9;
		}
		}

		@@ -75,6 +76,11 @@ message SearchResultContainer {
		message ShortcutsContainer {
		}

		// Container for generic system shortcuts for launcher specific settings.
		// Typically shown up as popup window by longpressing on empty space on workspace.
		message SettingsContainer {
		}

		enum Origin {
		UNKNOWN = 0;
		DEFAULT_LAYOUT = 1; // icon automatically placed in workspace, folder, hotseat

src/com/android/launcher3/BaseDraggingActivity.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -187,8 +187,9 @@ public abstract class BaseDraggingActivity extends BaseActivity
		sourceContainer);
		}
		getUserEventDispatcher().logAppLaunch(v, intent, user);
		getStatsLogManager().log(LAUNCHER_APP_LAUNCH_TAP, item == null ? null
		: item.buildProto());
		if (item != null) {
		getStatsLogManager().log(LAUNCHER_APP_LAUNCH_TAP, item.buildProto());
		}
		return true;
		} catch (NullPointerException\|ActivityNotFoundException\|SecurityException e) {
		Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();

src/com/android/launcher3/LauncherSettings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ public class LauncherSettings {
		// Represents search results view.
		public static final int CONTAINER_SEARCH_RESULTS = -106;
		public static final int CONTAINER_SHORTCUTS = -107;
		public static final int CONTAINER_SETTINGS = -108;

		public static final String containerToString(int container) {
		switch (container) {

src/com/android/launcher3/logging/StatsLogManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,9 @@ public class StatsLogManager implements ResourceBasedOverride {
		}

		public enum LauncherEvent implements EventEnum {
		/* Used to prevent double logging. */
		IGNORE(-1),

		@UiEvent(doc = "App launched from workspace, hotseat or folder in launcher")
		LAUNCHER_APP_LAUNCH_TAP(338),

src/com/android/launcher3/model/data/ItemInfo.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT
		import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
		import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
		import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SEARCH_RESULTS;
		import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SETTINGS;
		import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_SHORTCUTS;
		import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY;
		import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
		@@ -46,6 +47,7 @@ import com.android.launcher3.logger.LauncherAtom.AllAppsContainer;
		import com.android.launcher3.logger.LauncherAtom.ContainerInfo;
		import com.android.launcher3.logger.LauncherAtom.PredictionContainer;
		import com.android.launcher3.logger.LauncherAtom.SearchResultContainer;
		import com.android.launcher3.logger.LauncherAtom.SettingsContainer;
		import com.android.launcher3.logger.LauncherAtom.ShortcutsContainer;
		import com.android.launcher3.util.ContentWriter;

		@@ -369,6 +371,10 @@ public class ItemInfo {
		return ContainerInfo.newBuilder()
		.setShortcutsContainer(ShortcutsContainer.getDefaultInstance())
		.build();
		case CONTAINER_SETTINGS:
		return ContainerInfo.newBuilder()
		.setSettingsContainer(SettingsContainer.getDefaultInstance())
		.build();
		}
		return ContainerInfo.getDefaultInstance();
		}