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

Commit 12e68efb authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Load the spot hover icon when loading additional pointer resources 

For hovering styluses, we want to explicitly show the "spot hover" icon
when the "show touches" feature is enabled. To do this, ensure we load
this icon style alongside other additional icon styles.

Also, maintain an explicit list of the additional icons to load, instead
of relying on the implicit ordering of the enum constants that are
defined elsewhere.

Bug: 342067371
Test: manual, enable "show touches" and "enable apps to show pointer
while hovering" settings
Flag: EXEMPT bug fix

Change-Id: I25bde3b974b5af1bd5ccea1561db1053b8acf3fb
parent eb0c5075

services/core/jni/com_android_server_input_InputManagerService.cpp

+24 −3
Original line number Diff line number Diff line
@@ -1797,9 +1797,30 @@ void NativeInputManager::loadAdditionalMouseResources( 
    ATRACE_CALL();

    JNIEnv* env = jniEnv();



    for (int32_t iconId = static_cast<int32_t>(PointerIconStyle::TYPE_CONTEXT_MENU);

         iconId <= static_cast<int32_t>(PointerIconStyle::TYPE_HANDWRITING); ++iconId) {

        const PointerIconStyle pointerIconStyle = static_cast<PointerIconStyle>(iconId);

    constexpr static std::array ADDITIONAL_STYLES{PointerIconStyle::TYPE_CONTEXT_MENU,

                                                  PointerIconStyle::TYPE_HAND,

                                                  PointerIconStyle::TYPE_HELP,

                                                  PointerIconStyle::TYPE_WAIT,

                                                  PointerIconStyle::TYPE_CELL,

                                                  PointerIconStyle::TYPE_CROSSHAIR,

                                                  PointerIconStyle::TYPE_TEXT,

                                                  PointerIconStyle::TYPE_VERTICAL_TEXT,

                                                  PointerIconStyle::TYPE_ALIAS,

                                                  PointerIconStyle::TYPE_COPY,

                                                  PointerIconStyle::TYPE_NO_DROP,

                                                  PointerIconStyle::TYPE_ALL_SCROLL,

                                                  PointerIconStyle::TYPE_HORIZONTAL_DOUBLE_ARROW,

                                                  PointerIconStyle::TYPE_VERTICAL_DOUBLE_ARROW,

                                                  PointerIconStyle::TYPE_TOP_RIGHT_DOUBLE_ARROW,

                                                  PointerIconStyle::TYPE_TOP_LEFT_DOUBLE_ARROW,

                                                  PointerIconStyle::TYPE_ZOOM_IN,

                                                  PointerIconStyle::TYPE_ZOOM_OUT,

                                                  PointerIconStyle::TYPE_GRAB,

                                                  PointerIconStyle::TYPE_GRABBING,

                                                  PointerIconStyle::TYPE_HANDWRITING,

                                                  PointerIconStyle::TYPE_SPOT_HOVER};



    for (const auto pointerIconStyle : ADDITIONAL_STYLES) {

        PointerIcon pointerIcon = loadPointerIcon(env, displayId, pointerIconStyle);

        (*outResources)[pointerIconStyle] = toSpriteIcon(pointerIcon);

        if (!pointerIcon.bitmapFrames.empty()) {