diff options
| author | Mike Reed <reed@google.com> | 2014-07-07 15:44:40 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2014-07-07 15:47:55 -0400 |
| commit | 4a9c3891d4f890109e02bc83fecf9bcdf56a9395 (patch) | |
| tree | d0ad820a4e7b143df8d71708a7790e59b0467189 /libs/input | |
| parent | 904a1045ced36e844605b9764c3cb184976ea0a9 (diff) | |
| download | frameworks_base-4a9c3891d4f890109e02bc83fecf9bcdf56a9395.zip frameworks_base-4a9c3891d4f890109e02bc83fecf9bcdf56a9395.tar.gz frameworks_base-4a9c3891d4f890109e02bc83fecf9bcdf56a9395.tar.bz2 | |
kNative_8888_SkColorType is now kN32_SkColorType
Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b
Diffstat (limited to 'libs/input')
| -rw-r--r-- | libs/input/SpriteController.cpp | 2 | ||||
| -rw-r--r-- | libs/input/SpriteController.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/SpriteController.cpp b/libs/input/SpriteController.cpp index 063383b..a69c32d 100644 --- a/libs/input/SpriteController.cpp +++ b/libs/input/SpriteController.cpp @@ -401,7 +401,7 @@ void SpriteController::SpriteImpl::setIcon(const SpriteIcon& icon) { uint32_t dirty; if (icon.isValid()) { - icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kNative_8888_SkColorType); + icon.bitmap.copyTo(&mLocked.state.icon.bitmap, kN32_SkColorType); if (!mLocked.state.icon.isValid() || mLocked.state.icon.hotSpotX != icon.hotSpotX diff --git a/libs/input/SpriteController.h b/libs/input/SpriteController.h index 797efd7..905833c 100644 --- a/libs/input/SpriteController.h +++ b/libs/input/SpriteController.h @@ -65,7 +65,7 @@ struct SpriteIcon { inline SpriteIcon copy() const { SkBitmap bitmapCopy; - bitmap.copyTo(&bitmapCopy, kNative_8888_SkColorType); + bitmap.copyTo(&bitmapCopy, kN32_SkColorType); return SpriteIcon(bitmapCopy, hotSpotX, hotSpotY); } |