diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-24 11:28:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-24 11:28:48 +0000 |
| commit | 42e412b5111f99e6e4813aa9ab7450ec215ca09b (patch) | |
| tree | 08eec6c6c1d0725ed35b7db71a1d15f9ea18db6c /libs/input/MouseCursorController.h | |
| parent | be053b7e197809408865a2a4989df05d3012385b (diff) | |
| parent | 5267d9227289a074aa4c4a972586d182ce4c76a5 (diff) | |
Merge "Switch to callback animation" am: 51060f3f7a am: 5267d92272
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399752
Change-Id: I3e4d82a9a2f9e9f4f1232a2de21a55cc19a2168a
Diffstat (limited to 'libs/input/MouseCursorController.h')
| -rw-r--r-- | libs/input/MouseCursorController.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libs/input/MouseCursorController.h b/libs/input/MouseCursorController.h index 448165b5ac46..e6dfc4c6f99a 100644 --- a/libs/input/MouseCursorController.h +++ b/libs/input/MouseCursorController.h @@ -25,6 +25,7 @@ #include <utils/Looper.h> #include <utils/RefBase.h> +#include <functional> #include <map> #include <memory> #include <vector> @@ -61,8 +62,7 @@ public: void getAdditionalMouseResources(); bool isViewportValid(); - bool doBitmapAnimation(nsecs_t timestamp); - bool doFadingAnimation(nsecs_t timestamp, bool keepAnimating); + bool doAnimations(nsecs_t timestamp); bool resourcesLoaded(); @@ -96,6 +96,8 @@ private: int32_t buttonState; + bool animating{false}; + } mLocked GUARDED_BY(mLock); bool getBoundsLocked(float* outMinX, float* outMinY, float* outMaxX, float* outMaxY) const; @@ -104,6 +106,11 @@ private: void updatePointerLocked(); void loadResourcesLocked(bool getAdditionalMouseResources); + + bool doBitmapAnimationLocked(nsecs_t timestamp); + bool doFadingAnimationLocked(nsecs_t timestamp); + + void startAnimationLocked(); }; } // namespace android |