diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-20 15:37:27 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-20 15:37:27 -0700 |
| commit | 13ef17a37e683b8ad5800e9f542b411180fbec2f (patch) | |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 /src/com/android/launcher3/FirstFrameAnimatorHelper.java | |
| parent | e5ec4ac409eb3d3169bb9350dfda51ae7e08291e (diff) | |
| parent | e3fe3f89ee956e8d7995c569948cb70765ec19b8 (diff) | |
| download | android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.gz android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.tar.bz2 android_packages_apps_Trebuchet-13ef17a37e683b8ad5800e9f542b411180fbec2f.zip | |
merged ub-launcher3-burnaby, and resolved conflicts
Note1: Verified that following succeeds. $ make -j 32 dist checkbuild
Note2: Verified that the git history of burnaby is (998 commit) is pulled
into mnc-dev packages/apps/Launcher3 git project using gitk.
b/22609402
Change-Id: If20ed77328a71d05a590a7ee2e84d5472d0248ae
Diffstat (limited to 'src/com/android/launcher3/FirstFrameAnimatorHelper.java')
| -rw-r--r-- | src/com/android/launcher3/FirstFrameAnimatorHelper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/FirstFrameAnimatorHelper.java b/src/com/android/launcher3/FirstFrameAnimatorHelper.java index 095c5631d..a51ddd4b8 100644 --- a/src/com/android/launcher3/FirstFrameAnimatorHelper.java +++ b/src/com/android/launcher3/FirstFrameAnimatorHelper.java @@ -24,6 +24,8 @@ import android.view.View; import android.view.ViewPropertyAnimator; import android.view.ViewTreeObserver; +import com.android.launcher3.util.Thunk; + /* * This is a helper class that listens to updates from the corresponding animation. * For the first two frames, it adjusts the current play time of the animation to @@ -41,7 +43,7 @@ public class FirstFrameAnimatorHelper extends AnimatorListenerAdapter private boolean mAdjustedSecondFrameTime; private static ViewTreeObserver.OnDrawListener sGlobalDrawListener; - private static long sGlobalFrameCounter; + @Thunk static long sGlobalFrameCounter; private static boolean sVisible; public FirstFrameAnimatorHelper(ValueAnimator animator, View target) { |