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

Commit d379361e authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Update pointer hotspots to scale for DPI" into lmp-dev

parents 7b7b754f 376d10e9

core/java/android/view/PointerIcon.java

+6 −6
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ public final class PointerIcon implements Parcelable { 
     * Creates a custom pointer from the given bitmap and hotspot information.

     *

     * @param bitmap The bitmap for the icon.

     * @param hotspotX The X offset of the pointer icon hotspot in the bitmap.

     * @param hotSpotX The X offset of the pointer icon hotspot in the bitmap.

     *        Must be within the [0, bitmap.getWidth()) range.

     * @param hotspotY The Y offset of the pointer icon hotspot in the bitmap.

     * @param hotSpotY The Y offset of the pointer icon hotspot in the bitmap.

     *        Must be within the [0, bitmap.getHeight()) range.

     * @return A pointer icon for this bitmap.

     *
@@ -374,18 +374,18 @@ public final class PointerIcon implements Parcelable { 
    }



    private void loadResource(Context context, Resources resources, int resourceId) {

        XmlResourceParser parser = resources.getXml(resourceId);

        final XmlResourceParser parser = resources.getXml(resourceId);

        final int bitmapRes;

        final float hotSpotX;

        final float hotSpotY;

        try {

            XmlUtils.beginDocument(parser, "pointer-icon");



            TypedArray a = resources.obtainAttributes(

            final TypedArray a = resources.obtainAttributes(

                    parser, com.android.internal.R.styleable.PointerIcon);

            bitmapRes = a.getResourceId(com.android.internal.R.styleable.PointerIcon_bitmap, 0);

            hotSpotX = a.getFloat(com.android.internal.R.styleable.PointerIcon_hotSpotX, 0);

            hotSpotY = a.getFloat(com.android.internal.R.styleable.PointerIcon_hotSpotY, 0);

            hotSpotX = a.getDimension(com.android.internal.R.styleable.PointerIcon_hotSpotX, 0);

            hotSpotY = a.getDimension(com.android.internal.R.styleable.PointerIcon_hotSpotY, 0);

            a.recycle();

        } catch (Exception ex) {

            throw new IllegalArgumentException("Exception parsing pointer icon resource.", ex);

core/res/res/drawable-hdpi/pointer_spot_anchor.png

+557 B (7.2 KiB)
Loading image diff...

core/res/res/drawable-hdpi/pointer_spot_anchor_icon.xml

deleted100644 → 0
+0 −5
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/pointer_spot_anchor"

    android:hotSpotX="33"

    android:hotSpotY="33" />

core/res/res/drawable-hdpi/pointer_spot_hover.png

−1.63 KiB (7.82 KiB)
Loading image diff...

core/res/res/drawable-hdpi/pointer_spot_hover_icon.xml

deleted100644 → 0
+0 −5
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/pointer_spot_hover"

    android:hotSpotX="33"

    android:hotSpotY="33" />