diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-03-08 16:55:47 -0800 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2016-03-08 16:55:47 -0800 |
commit | 8fd5e938d34ee84d076b5c5d2575cc6c46c254ce (patch) | |
tree | 3aeac9ef99a4e946d861a3bf50e15d4fadb65be7 /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
parent | 726eb822d38ad422f37b74c4b0fc504a423ab926 (diff) | |
download | android_packages_apps_Trebuchet-8fd5e938d34ee84d076b5c5d2575cc6c46c254ce.tar.gz android_packages_apps_Trebuchet-8fd5e938d34ee84d076b5c5d2575cc6c46c254ce.tar.bz2 android_packages_apps_Trebuchet-8fd5e938d34ee84d076b5c5d2575cc6c46c254ce.zip |
Add getUserEventLogger to LauncherCallbacks
b/26494415
Change-Id: I8abaaf1269c12435a523e31bf769991018ea5c02
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
-rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index 54945be3d..303785de5 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -148,6 +148,7 @@ public class LauncherStateTransitionAnimation { } @Override void onTransitionComplete() { + mLauncher.getLogger().resetElapsedContainerMillis(); if (startSearchAfterTransition) { toView.startAppsSearch(); } @@ -167,7 +168,12 @@ public class LauncherStateTransitionAnimation { final View buttonView = mLauncher.getWidgetsButton(); mCurrentAnimation = startAnimationToOverlay(fromWorkspaceState, Workspace.State.OVERVIEW_HIDDEN, buttonView, toView, animated, - new PrivateTransitionCallbacks(FINAL_REVEAL_ALPHA_FOR_WIDGETS)); + new PrivateTransitionCallbacks(FINAL_REVEAL_ALPHA_FOR_WIDGETS){ + @Override + void onTransitionComplete() { + mLauncher.getLogger().resetElapsedContainerMillis(); + } + }); } /** @@ -462,6 +468,10 @@ public class LauncherStateTransitionAnimation { } }; } + @Override + void onTransitionComplete() { + mLauncher.getLogger().resetElapsedContainerMillis(); + } }; // Only animate the search bar if animating to spring loaded mode from all apps mCurrentAnimation = startAnimationToWorkspaceFromOverlay(fromWorkspaceState, toWorkspaceState, @@ -488,6 +498,10 @@ public class LauncherStateTransitionAnimation { } }; } + @Override + void onTransitionComplete() { + mLauncher.getLogger().resetElapsedContainerMillis(); + } }; mCurrentAnimation = startAnimationToWorkspaceFromOverlay( fromWorkspaceState, toWorkspaceState, |