PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[AA+] Fix missing InstanceId for LAUNCHER_ALLAPPS_CLOSE_DOWN event." into sc-dev

Browse Source
This commit is contained in:
Thiru Ramasamy
2021-04-05 17:01:27 +00:00
committed by Android (Google) Code Review
parent 11d7d34f0d 0eabc781b1
commit 9efbf6f39b
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+14 -10
View File
@@ -994,7 +994,19 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
} }
// When multiple pages are visible, show persistent page indicator // When multiple pages are visible, show persistent page indicator
mWorkspace.getPageIndicator().setShouldAutoHide(!state.hasFlag(FLAG_MULTI_PAGE)); mWorkspace.getPageIndicator().setShouldAutoHide(!state.hasFlag(FLAG_MULTI_PAGE));
mPrevLauncherState = mStateManager.getCurrentStableState(); mPrevLauncherState = mStateManager.getCurrentStableState();
if (mPrevLauncherState != state && ALL_APPS.equals(state)
// Making sure mAllAppsSessionLogId is null to avoid double logging.
&& mAllAppsSessionLogId == null) {
// creates new instance ID since new all apps session is started.
mAllAppsSessionLogId = new InstanceIdSequence().newInstanceId();
getStatsLogManager()
.logger()
.log(FeatureFlags.ENABLE_DEVICE_SEARCH.get()
? LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH
: LAUNCHER_ALLAPPS_ENTRY);
}
} }
@Override @Override
@@ -1019,16 +1031,8 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
getRotationHelper().setCurrentStateRequest(REQUEST_NONE); getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
} }
if (ALL_APPS.equals(state)) { if (mPrevLauncherState != state && !ALL_APPS.equals(state)
// creates new instance ID since new all apps session is started. // Making sure mAllAppsSessionLogId is not null to avoid double logging.
mAllAppsSessionLogId = new InstanceIdSequence().newInstanceId();
getStatsLogManager()
.logger()
.log(FeatureFlags.ENABLE_DEVICE_SEARCH.get()
? LAUNCHER_ALLAPPS_ENTRY_WITH_DEVICE_SEARCH
: LAUNCHER_ALLAPPS_ENTRY);
} else if (ALL_APPS.equals(mPrevLauncherState)
// Check if mLogInstanceId is not null to make sure exit event is logged only once.
&& mAllAppsSessionLogId != null) { && mAllAppsSessionLogId != null) {
getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_EXIT); getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_EXIT);
mAllAppsSessionLogId = null; mAllAppsSessionLogId = null;
src/com/android/launcher3/touch/AbstractStateChangeTouchController.java
+3 -4
View File
@@ -317,7 +317,9 @@ public abstract class AbstractStateChangeTouchController
Math.min(progress, 1) - endProgress) * durationMultiplier; Math.min(progress, 1) - endProgress) * durationMultiplier;
} }
} }
if (targetState != mStartState) {
logReachedState(targetState);
}
mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState)); mCurrentAnimation.setEndAction(() -> onSwipeInteractionCompleted(targetState));
ValueAnimator anim = mCurrentAnimation.getAnimationPlayer(); ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();
anim.setFloatValues(startProgress, endProgress); anim.setFloatValues(startProgress, endProgress);
@@ -345,9 +347,6 @@ public abstract class AbstractStateChangeTouchController
} }
protected void goToTargetState(LauncherState targetState) { protected void goToTargetState(LauncherState targetState) {
if (targetState != mStartState) {
logReachedState(targetState);
}
if (!mLauncher.isInState(targetState)) { if (!mLauncher.isInState(targetState)) {
// If we're already in the target state, don't jump to it at the end of the animation in // If we're already in the target state, don't jump to it at the end of the animation in
// case the user started interacting with it before the animation finished. // case the user started interacting with it before the animation finished.