diff options
author | Becky Qiu <xuqiu@google.com> | 2019-08-23 20:01:05 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-23 20:01:05 -0700 |
commit | 71959e59d283a7fbe59eeacd588de035901b4adf (patch) | |
tree | 552dcbd05ed0233d299c49125748e6ba93e98d56 /quickstep/src | |
parent | 84768d83bc1ed9b97706f00b5b39905201d8966a (diff) | |
parent | 6d0d8969f648c9dcb7380a64c79588a17d9b6271 (diff) | |
download | packages_apps_Trebuchet-71959e59d283a7fbe59eeacd588de035901b4adf.tar.gz packages_apps_Trebuchet-71959e59d283a7fbe59eeacd588de035901b4adf.tar.bz2 packages_apps_Trebuchet-71959e59d283a7fbe59eeacd588de035901b4adf.zip |
Merge "Move swipe actions on container logging to west world." into ub-launcher3-qt-qpr1-dev
am: 6d0d8969f6
Change-Id: I2229ea7c878ac84b00110235df65ced2f9baf171
Diffstat (limited to 'quickstep/src')
-rw-r--r-- | quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java index 13a8dc26a..bf3cd8afe 100644 --- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java +++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java @@ -16,11 +16,6 @@ package com.android.quickstep.logging; -import android.content.Context; -import android.content.Intent; -import android.stats.launcher.nano.LauncherExtension; -import android.stats.launcher.nano.LauncherTarget; - import static android.stats.launcher.nano.Launcher.ALLAPPS; import static android.stats.launcher.nano.Launcher.HOME; import static android.stats.launcher.nano.Launcher.LAUNCH_APP; @@ -29,6 +24,11 @@ import static android.stats.launcher.nano.Launcher.DISMISS_TASK; import static android.stats.launcher.nano.Launcher.BACKGROUND; import static android.stats.launcher.nano.Launcher.OVERVIEW; +import android.content.Context; +import android.content.Intent; +import android.stats.launcher.nano.Launcher; +import android.stats.launcher.nano.LauncherExtension; +import android.stats.launcher.nano.LauncherTarget; import android.view.View; import com.android.launcher3.ItemInfo; @@ -39,8 +39,6 @@ import com.android.launcher3.util.ComponentKey; import com.android.systemui.shared.system.StatsLogCompat; import com.google.protobuf.nano.MessageNano; -import androidx.annotation.Nullable; - /** * This method calls the StatsLog hidden method until they are made available public. * @@ -85,6 +83,17 @@ public class StatsLogCompatManager extends StatsLogManager { MessageNano.toByteArray(ext), true); } + @Override + public void logSwipeOnContainer(boolean isSwipingToLeft, int pageId) { + LauncherExtension ext = new LauncherExtension(); + ext.srcTarget = new LauncherTarget[1]; + int srcState = mStateProvider.getCurrentState(); + fillInLauncherExtensionWithPageId(ext, pageId); + int launcherAction = isSwipingToLeft ? Launcher.SWIPE_LEFT : Launcher.SWIPE_RIGHT; + StatsLogCompat.write(launcherAction, srcState, srcState, + MessageNano.toByteArray(ext), true); + } + public static boolean fillInLauncherExtension(View v, LauncherExtension extension) { StatsLogUtils.LogContainerProvider provider = StatsLogUtils.getLaunchProviderRecursive(v); if (v == null || !(v.getTag() instanceof ItemInfo) || provider == null) { @@ -99,6 +108,13 @@ public class StatsLogCompatManager extends StatsLogManager { return true; } + public static boolean fillInLauncherExtensionWithPageId(LauncherExtension ext, int pageId) { + Target target = new Target(); + target.pageIndex = pageId; + copy(target, ext.srcTarget[0]); + return true; + } + private static void copy(Target src, LauncherTarget dst) { // fill in } |