drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mouse pointer tweaks." into honeycomb

Browse Source
This commit is contained in:
Jeff Brown
2011-01-17 16:17:44 -08:00
committed by Android (Google) Code Review
parent a8e519a322 f5a2ff6f2e
commit f2bc4ee97f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-mdpi/pointer_arrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

12
services/input/PointerController.cpp
View File

@ -310,8 +310,16 @@ void PointerController::setDisplayOrientation(int32_t orientation) {
void PointerController::setPointerIcon(const SkBitmap* bitmap, float hotSpotX, float hotSpotY) { void PointerController::setPointerIcon(const SkBitmap* bitmap, float hotSpotX, float hotSpotY) {
AutoMutex _l(mLock); AutoMutex _l(mLock);
delete mLocked.iconBitmap; if (mLocked.iconBitmap) {
mLocked.iconBitmap = bitmap ? new SkBitmap(*bitmap) : NULL; delete mLocked.iconBitmap;
mLocked.iconBitmap = NULL;
}
if (bitmap) {
mLocked.iconBitmap = new SkBitmap();
bitmap->copyTo(mLocked.iconBitmap, SkBitmap::kARGB_8888_Config);
}
mLocked.iconHotSpotX = hotSpotX; mLocked.iconHotSpotX = hotSpotX;
mLocked.iconHotSpotY = hotSpotY; mLocked.iconHotSpotY = hotSpotY;
mLocked.drawn = false; mLocked.drawn = false;