summaryrefslogtreecommitdiff
path: root/libs/input/SpriteController.h
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2018-12-17 18:59:36 +0000
committerKamaljeet Maini <kamaljeet@google.com>2018-12-17 13:49:37 -0800
commitd44026fd472a8c48738a882f6ea4a33a8e9aede1 (patch)
treea43aa4aeee0c6d06581bec5d5ae848ae1b9fe7d7 /libs/input/SpriteController.h
parent74f1ce3fc1f12382d04fb0b405c3567c7b88a97d (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/SpriteController.h')
-rw-r--r--libs/input/SpriteController.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h
index 5b216f50d113..31e43e9b99e5 100644
--- a/libs/input/SpriteController.h
+++ b/libs/input/SpriteController.h
@@ -125,9 +125,6 @@ public:
/* Sets the sprite transformation matrix. */
virtual void setTransformationMatrix(const SpriteTransformationMatrix& matrix) = 0;
-
- /* Sets the id of the display where the sprite should be shown. */
- virtual void setDisplayId(int32_t displayId) = 0;
};
/*
@@ -173,7 +170,6 @@ private:
DIRTY_LAYER = 1 << 4,
DIRTY_VISIBILITY = 1 << 5,
DIRTY_HOTSPOT = 1 << 6,
- DIRTY_DISPLAY_ID = 1 << 7,
};
/* Describes the state of a sprite.
@@ -184,7 +180,7 @@ private:
struct SpriteState {
inline SpriteState() :
dirty(0), visible(false),
- positionX(0), positionY(0), layer(0), alpha(1.0f), displayId(ADISPLAY_ID_DEFAULT),
+ positionX(0), positionY(0), layer(0), alpha(1.0f),
surfaceWidth(0), surfaceHeight(0), surfaceDrawn(false), surfaceVisible(false) {
}
@@ -197,7 +193,6 @@ private:
int32_t layer;
float alpha;
SpriteTransformationMatrix transformationMatrix;
- int32_t displayId;
sp<SurfaceControl> surfaceControl;
int32_t surfaceWidth;
@@ -230,7 +225,6 @@ private:
virtual void setLayer(int32_t layer);
virtual void setAlpha(float alpha);
virtual void setTransformationMatrix(const SpriteTransformationMatrix& matrix);
- virtual void setDisplayId(int32_t displayId);
inline const SpriteState& getStateLocked() const {
return mLocked.state;