Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f16c5e7a authored by Mike Reed's avatar Mike Reed Committed by Android (Google) Code Review
Browse files

Merge "kNative_8888_SkColorType is now kN32_SkColorType"

parents 2a0d4a1f 4a9c3891

core/jni/android/graphics/BitmapFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

libs/input/SpriteController.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

libs/input/SpriteController.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

services/core/jni/com_android_server_input_InputManagerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }