Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kNative_8888_SkColorType is now kN32_SkColorType

Browse Source 
Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b
This commit is contained in:
Mike Reed
2014-07-07 15:44:40 -04:00
parent 904a1045ce
commit 4a9c3891d4
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -116,7 +116,7 @@ static SkColorType colorTypeForScaledOutput(SkColorType colorType) {
switch (colorType) {
case kUnknown_SkColorType:
case kIndex_8_SkColorType:
return kNative_8888_SkColorType;
return kN32_SkColorType;
default:
break;
}

2
libs/input/SpriteController.cpp
View File

@@ -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

2
libs/input/SpriteController.h
View File

@@ -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);
}

2
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -150,7 +150,7 @@ static void loadSystemIconAsSprite(JNIEnv* env, jobject contextObj, int32_t styl
status_t status = android_view_PointerIcon_loadSystemIcon(env,
contextObj, style, &pointerIcon);
if (!status) {
pointerIcon.bitmap.copyTo(&outSpriteIcon->bitmap, kNative_8888_SkColorType);
pointerIcon.bitmap.copyTo(&outSpriteIcon->bitmap, kN32_SkColorType);
outSpriteIcon->hotSpotX = pointerIcon.hotSpotX;
outSpriteIcon->hotSpotY = pointerIcon.hotSpotY;
}