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

Commit b4ff35df authored by Jeff Brown's avatar Jeff Brown
Browse files

Mouse pointer integration. 

Added support for loading the pointer icon from a resource.

Moved the system server related bits of the input manager out
of libui and into libinput since they do not need to be linked into
applications.

Change-Id: Iec11e0725b3add2b905c51f8ea2c3b4b0d1a2d67
parent a5af5d6b

cmds/system_server/library/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libaudioflinger \

    libcameraservice \

    libmediaplayerservice \

    libinput \

	libutils \

	libbinder \

	libcutils

core/res/res/drawable-mdpi/pointericon_default.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<pointer-icon xmlns:android="http://schemas.android.com/apk/res/android"

    android:bitmap="@drawable/pointericon_default_bitmap"

    android:hotSpotX="2"

    android:hotSpotY="2" />

core/res/res/drawable-mdpi/pointericon_default_bitmap.png

0 → 100644
+838 B
Loading image diff...

core/res/res/values/attrs.xml

+9 −0
Original line number Diff line number Diff line
@@ -4708,4 +4708,13 @@ 
        <!-- Minimum space between the switch and caption text -->

        <attr name="switchPadding" format="dimension" />

    </declare-styleable>



    <declare-styleable name="PointerIcon">

        <!-- Drawable to use as the icon bitmap. -->

        <attr name="bitmap" format="reference" />

        <!-- X coordinate of the icon hot spot. -->

        <attr name="hotSpotX" format="float" />

        <!-- Y coordinate of the icon hot spot. -->

        <attr name="hotSpotY" format="float" />

    </declare-styleable>

</resources>

include/ui/DisplayInfo.h

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@ struct DisplayInfo { 
    float               ydpi;

};



/* Display orientations as defined in Surface.java and ISurfaceComposer.h. */

enum {

    DISPLAY_ORIENTATION_0 = 0,

    DISPLAY_ORIENTATION_90 = 1,

    DISPLAY_ORIENTATION_180 = 2,

    DISPLAY_ORIENTATION_270 = 3

};





}; // namespace android



#endif // ANDROID_COMPOSER_DISPLAY_INFO_H