Merge "Count launching the same app as an app launch for Quickstep onboarding" into pi-dev

This commit is contained in:
android-build-team Robot
2018-05-08 17:26:31 +00:00
committed by Android (Google) Code Review

View File

@@ -93,7 +93,6 @@ public class RecentsOnboarding {
private boolean mOverviewProxyListenerRegistered; private boolean mOverviewProxyListenerRegistered;
private boolean mTaskListenerRegistered; private boolean mTaskListenerRegistered;
private boolean mLayoutAttachedToWindow; private boolean mLayoutAttachedToWindow;
private int mLastTaskId;
private boolean mHasDismissedSwipeUpTip; private boolean mHasDismissedSwipeUpTip;
private boolean mHasDismissedQuickScrubTip; private boolean mHasDismissedQuickScrubTip;
private int mNumAppsLaunchedSinceSwipeUpTipDismiss; private int mNumAppsLaunchedSinceSwipeUpTipDismiss;
@@ -111,14 +110,8 @@ public class RecentsOnboarding {
hide(true); hide(true);
return; return;
} }
if (info.id == mLastTaskId) {
// We only count launches that go to a new task.
return;
}
int activityType = info.configuration.windowConfiguration.getActivityType(); int activityType = info.configuration.windowConfiguration.getActivityType();
if (activityType == ACTIVITY_TYPE_STANDARD) { if (activityType == ACTIVITY_TYPE_STANDARD) {
mLastTaskId = info.id;
boolean alreadySeenSwipeUpOnboarding = hasSeenSwipeUpOnboarding(); boolean alreadySeenSwipeUpOnboarding = hasSeenSwipeUpOnboarding();
boolean alreadySeenQuickScrubsOnboarding = hasSeenQuickScrubOnboarding(); boolean alreadySeenQuickScrubsOnboarding = hasSeenQuickScrubOnboarding();
if (alreadySeenSwipeUpOnboarding && alreadySeenQuickScrubsOnboarding) { if (alreadySeenSwipeUpOnboarding && alreadySeenQuickScrubsOnboarding) {