diff options
| author | Andrii Kulian <akulian@google.com> | 2018-12-17 18:59:36 +0000 |
|---|---|---|
| committer | Kamaljeet Maini <kamaljeet@google.com> | 2018-12-17 13:49:37 -0800 |
| commit | d44026fd472a8c48738a882f6ea4a33a8e9aede1 (patch) | |
| tree | a43aa4aeee0c6d06581bec5d5ae848ae1b9fe7d7 /libs/input/PointerController.h | |
| parent | 74f1ce3fc1f12382d04fb0b405c3567c7b88a97d (diff) | |
Revert "Support mouse pointer on external displays (2/3)"
This reverts commit 84cdf9cc3b849679e6b4f6d3ccb66270f0abad2f.
Reason for revert: b/120864177
Test: Presubmit
Bug: b/120864177
Change-Id: Ia65e704169527b54cf1d1d470445f96a65fa0294
Diffstat (limited to 'libs/input/PointerController.h')
| -rw-r--r-- | libs/input/PointerController.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h index a32cc42a3342..7f4e5a59c9b6 100644 --- a/libs/input/PointerController.h +++ b/libs/input/PointerController.h @@ -23,7 +23,6 @@ #include <vector> #include <ui/DisplayInfo.h> -#include <input/DisplayViewport.h> #include <input/Input.h> #include <PointerControllerInterface.h> #include <utils/BitSet.h> @@ -97,7 +96,6 @@ public: virtual int32_t getButtonState() const; virtual void setPosition(float x, float y); virtual void getPosition(float* outX, float* outY) const; - virtual int32_t getDisplayId() const; virtual void fade(Transition transition); virtual void unfade(Transition transition); @@ -108,7 +106,7 @@ public: void updatePointerIcon(int32_t iconId); void setCustomPointerIcon(const SpriteIcon& icon); - void setDisplayViewport(const DisplayViewport& viewport); + void setDisplayViewport(int32_t width, int32_t height, int32_t orientation); void setInactivityTimeout(InactivityTimeout inactivityTimeout); void reloadPointerResources(); @@ -158,7 +156,9 @@ private: size_t animationFrameIndex; nsecs_t lastFrameUpdatedTime; - DisplayViewport viewport; + int32_t displayWidth; + int32_t displayHeight; + int32_t displayOrientation; InactivityTimeout inactivityTimeout; @@ -182,7 +182,7 @@ private: Vector<Spot*> spots; Vector<sp<Sprite> > recycledSprites; - } mLocked GUARDED_BY(mLock); + } mLocked; bool getBoundsLocked(float* outMinX, float* outMinY, float* outMaxX, float* outMaxY) const; void setPositionLocked(float x, float y); @@ -207,7 +207,7 @@ private: void fadeOutAndReleaseSpotLocked(Spot* spot); void fadeOutAndReleaseAllSpotsLocked(); - void loadResourcesLocked(); + void loadResources(); }; } // namespace android |