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

Commit a1e0cebf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev

parents 005f9a73 f9d9ce77

api/current.txt

+29 −28
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ package android { 
    field public static final deprecated int phoneNumber = 16843111; // 0x1010167

    field public static final int pivotX = 16843189; // 0x10101b5

    field public static final int pivotY = 16843190; // 0x10101b6

    field public static final int pointerShape = 16844042; // 0x101050a

    field public static final int pointerIcon = 16844042; // 0x101050a

    field public static final int popupAnimationStyle = 16843465; // 0x10102c9

    field public static final int popupBackground = 16843126; // 0x1010176

    field public static final int popupCharacters = 16843332; // 0x1010244
@@ -41934,35 +41934,35 @@ package android.view { 
  }















  public final class PointerIcon implements android.os.Parcelable {













    method public static android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float);













    method public static android.view.PointerIcon create(android.graphics.Bitmap, float, float);















    method public int describeContents();















    method public static android.view.PointerIcon getSystemIcon(android.content.Context, int);













    method public static android.view.PointerIcon loadCustomIcon(android.content.res.Resources, int);













    method public static android.view.PointerIcon load(android.content.res.Resources, int);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.view.PointerIcon> CREATOR;













    field public static final int STYLE_ALIAS = 1010; // 0x3f2













    field public static final int STYLE_ALL_SCROLL = 1013; // 0x3f5













    field public static final int STYLE_ARROW = 1000; // 0x3e8













    field public static final int STYLE_CELL = 1006; // 0x3ee













    field public static final int STYLE_CONTEXT_MENU = 1001; // 0x3e9













    field public static final int STYLE_COPY = 1011; // 0x3f3













    field public static final int STYLE_CROSSHAIR = 1007; // 0x3ef













    field public static final int STYLE_DEFAULT = 1000; // 0x3e8













    field public static final int STYLE_GRAB = 1020; // 0x3fc













    field public static final int STYLE_GRABBING = 1021; // 0x3fd













    field public static final int STYLE_HAND = 1002; // 0x3ea













    field public static final int STYLE_HELP = 1003; // 0x3eb













    field public static final int STYLE_HORIZONTAL_DOUBLE_ARROW = 1014; // 0x3f6













    field public static final int STYLE_NO_DROP = 1012; // 0x3f4













    field public static final int STYLE_NULL = 0; // 0x0













    field public static final int STYLE_TEXT = 1008; // 0x3f0













    field public static final int STYLE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW = 1017; // 0x3f9













    field public static final int STYLE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW = 1016; // 0x3f8













    field public static final int STYLE_VERTICAL_DOUBLE_ARROW = 1015; // 0x3f7













    field public static final int STYLE_VERTICAL_TEXT = 1009; // 0x3f1













    field public static final int STYLE_WAIT = 1004; // 0x3ec













    field public static final int STYLE_ZOOM_IN = 1018; // 0x3fa













    field public static final int STYLE_ZOOM_OUT = 1019; // 0x3fb













    field public static final int TYPE_ALIAS = 1010; // 0x3f2













    field public static final int TYPE_ALL_SCROLL = 1013; // 0x3f5













    field public static final int TYPE_ARROW = 1000; // 0x3e8













    field public static final int TYPE_CELL = 1006; // 0x3ee













    field public static final int TYPE_CONTEXT_MENU = 1001; // 0x3e9













    field public static final int TYPE_COPY = 1011; // 0x3f3













    field public static final int TYPE_CROSSHAIR = 1007; // 0x3ef













    field public static final int TYPE_DEFAULT = 1000; // 0x3e8













    field public static final int TYPE_GRAB = 1020; // 0x3fc













    field public static final int TYPE_GRABBING = 1021; // 0x3fd













    field public static final int TYPE_HAND = 1002; // 0x3ea













    field public static final int TYPE_HELP = 1003; // 0x3eb













    field public static final int TYPE_HORIZONTAL_DOUBLE_ARROW = 1014; // 0x3f6













    field public static final int TYPE_NO_DROP = 1012; // 0x3f4













    field public static final int TYPE_NULL = 0; // 0x0













    field public static final int TYPE_TEXT = 1008; // 0x3f0













    field public static final int TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW = 1017; // 0x3f9













    field public static final int TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW = 1016; // 0x3f8













    field public static final int TYPE_VERTICAL_DOUBLE_ARROW = 1015; // 0x3f7













    field public static final int TYPE_VERTICAL_TEXT = 1009; // 0x3f1













    field public static final int TYPE_WAIT = 1004; // 0x3ec













    field public static final int TYPE_ZOOM_IN = 1018; // 0x3fa













    field public static final int TYPE_ZOOM_OUT = 1019; // 0x3fb















  }





























  public class ScaleGestureDetector {










@@ -42328,7 +42328,7 @@ package android.view {













    method public android.view.ViewParent getParentForAccessibility();















    method public float getPivotX();















    method public float getPivotY();













    method public android.view.PointerIcon getPointerIcon(android.view.MotionEvent, float, float);













    method public android.view.PointerIcon getPointerIcon();















    method public android.content.res.Resources getResources();















    method public final int getRight();















    method protected float getRightFadingEdgeStrength();










@@ -42479,6 +42479,7 @@ package android.view {













    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);















    method public void onProvideStructure(android.view.ViewStructure);















    method public void onProvideVirtualStructure(android.view.ViewStructure);













    method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);















    method protected void onRestoreInstanceState(android.os.Parcelable);















    method public void onRtlPropertiesChanged(int);















    method protected android.os.Parcelable onSaveInstanceState();










@@ -42525,6 +42526,7 @@ package android.view {













    method public boolean requestFocus(int, android.graphics.Rect);















    method public final boolean requestFocusFromTouch();















    method public void requestLayout();













    method public void requestPointerCapture();















    method public boolean requestRectangleOnScreen(android.graphics.Rect);















    method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);















    method public final void requestUnbufferedDispatch(android.view.MotionEvent);










@@ -42615,7 +42617,6 @@ package android.view {













    method public void setPaddingRelative(int, int, int, int);















    method public void setPivotX(float);















    method public void setPivotY(float);













    method public void setPointerCapture();















    method public void setPointerIcon(android.view.PointerIcon);















    method public void setPressed(boolean);















    method public final void setRight(int);

























api/system-current.txt



+29
−28




























Original line number
Diff line number
Diff line








@@ -1047,7 +1047,7 @@ package android {













    field public static final deprecated int phoneNumber = 16843111; // 0x1010167















    field public static final int pivotX = 16843189; // 0x10101b5















    field public static final int pivotY = 16843190; // 0x10101b6













    field public static final int pointerShape = 16844042; // 0x101050a













    field public static final int pointerIcon = 16844042; // 0x101050a















    field public static final int popupAnimationStyle = 16843465; // 0x10102c9















    field public static final int popupBackground = 16843126; // 0x1010176















    field public static final int popupCharacters = 16843332; // 0x1010244










@@ -44932,35 +44932,35 @@ package android.view {













  }





























  public final class PointerIcon implements android.os.Parcelable {













    method public static android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float);













    method public static android.view.PointerIcon create(android.graphics.Bitmap, float, float);















    method public int describeContents();















    method public static android.view.PointerIcon getSystemIcon(android.content.Context, int);













    method public static android.view.PointerIcon loadCustomIcon(android.content.res.Resources, int);













    method public static android.view.PointerIcon load(android.content.res.Resources, int);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.view.PointerIcon> CREATOR;













    field public static final int STYLE_ALIAS = 1010; // 0x3f2













    field public static final int STYLE_ALL_SCROLL = 1013; // 0x3f5













    field public static final int STYLE_ARROW = 1000; // 0x3e8













    field public static final int STYLE_CELL = 1006; // 0x3ee













    field public static final int STYLE_CONTEXT_MENU = 1001; // 0x3e9













    field public static final int STYLE_COPY = 1011; // 0x3f3













    field public static final int STYLE_CROSSHAIR = 1007; // 0x3ef













    field public static final int STYLE_DEFAULT = 1000; // 0x3e8













    field public static final int STYLE_GRAB = 1020; // 0x3fc













    field public static final int STYLE_GRABBING = 1021; // 0x3fd













    field public static final int STYLE_HAND = 1002; // 0x3ea













    field public static final int STYLE_HELP = 1003; // 0x3eb













    field public static final int STYLE_HORIZONTAL_DOUBLE_ARROW = 1014; // 0x3f6













    field public static final int STYLE_NO_DROP = 1012; // 0x3f4













    field public static final int STYLE_NULL = 0; // 0x0













    field public static final int STYLE_TEXT = 1008; // 0x3f0













    field public static final int STYLE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW = 1017; // 0x3f9













    field public static final int STYLE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW = 1016; // 0x3f8













    field public static final int STYLE_VERTICAL_DOUBLE_ARROW = 1015; // 0x3f7













    field public static final int STYLE_VERTICAL_TEXT = 1009; // 0x3f1













    field public static final int STYLE_WAIT = 1004; // 0x3ec













    field public static final int STYLE_ZOOM_IN = 1018; // 0x3fa













    field public static final int STYLE_ZOOM_OUT = 1019; // 0x3fb













    field public static final int TYPE_ALIAS = 1010; // 0x3f2













    field public static final int TYPE_ALL_SCROLL = 1013; // 0x3f5













    field public static final int TYPE_ARROW = 1000; // 0x3e8













    field public static final int TYPE_CELL = 1006; // 0x3ee













    field public static final int TYPE_CONTEXT_MENU = 1001; // 0x3e9













    field public static final int TYPE_COPY = 1011; // 0x3f3













    field public static final int TYPE_CROSSHAIR = 1007; // 0x3ef













    field public static final int TYPE_DEFAULT = 1000; // 0x3e8













    field public static final int TYPE_GRAB = 1020; // 0x3fc













    field public static final int TYPE_GRABBING = 1021; // 0x3fd













    field public static final int TYPE_HAND = 1002; // 0x3ea













    field public static final int TYPE_HELP = 1003; // 0x3eb













    field public static final int TYPE_HORIZONTAL_DOUBLE_ARROW = 1014; // 0x3f6













    field public static final int TYPE_NO_DROP = 1012; // 0x3f4













    field public static final int TYPE_NULL = 0; // 0x0













    field public static final int TYPE_TEXT = 1008; // 0x3f0













    field public static final int TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW = 1017; // 0x3f9













    field public static final int TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW = 1016; // 0x3f8













    field public static final int TYPE_VERTICAL_DOUBLE_ARROW = 1015; // 0x3f7













    field public static final int TYPE_VERTICAL_TEXT = 1009; // 0x3f1













    field public static final int TYPE_WAIT = 1004; // 0x3ec













    field public static final int TYPE_ZOOM_IN = 1018; // 0x3fa













    field public static final int TYPE_ZOOM_OUT = 1019; // 0x3fb















  }





























  public class ScaleGestureDetector {










@@ -45326,7 +45326,7 @@ package android.view {













    method public android.view.ViewParent getParentForAccessibility();















    method public float getPivotX();















    method public float getPivotY();













    method public android.view.PointerIcon getPointerIcon(android.view.MotionEvent, float, float);













    method public android.view.PointerIcon getPointerIcon();















    method public android.content.res.Resources getResources();















    method public final int getRight();















    method protected float getRightFadingEdgeStrength();










@@ -45477,6 +45477,7 @@ package android.view {













    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);















    method public void onProvideStructure(android.view.ViewStructure);















    method public void onProvideVirtualStructure(android.view.ViewStructure);













    method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);















    method protected void onRestoreInstanceState(android.os.Parcelable);















    method public void onRtlPropertiesChanged(int);















    method protected android.os.Parcelable onSaveInstanceState();










@@ -45523,6 +45524,7 @@ package android.view {













    method public boolean requestFocus(int, android.graphics.Rect);















    method public final boolean requestFocusFromTouch();















    method public void requestLayout();













    method public void requestPointerCapture();















    method public boolean requestRectangleOnScreen(android.graphics.Rect);















    method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);















    method public final void requestUnbufferedDispatch(android.view.MotionEvent);










@@ -45613,7 +45615,6 @@ package android.view {













    method public void setPaddingRelative(int, int, int, int);















    method public void setPivotX(float);















    method public void setPivotY(float);













    method public void setPointerCapture();















    method public void setPointerIcon(android.view.PointerIcon);















    method public void setPressed(boolean);















    method public final void setRight(int);

























api/test-current.txt



+29
−28




























Original line number
Diff line number
Diff line








@@ -941,7 +941,7 @@ package android {













    field public static final deprecated int phoneNumber = 16843111; // 0x1010167















    field public static final int pivotX = 16843189; // 0x10101b5















    field public static final int pivotY = 16843190; // 0x10101b6













    field public static final int pointerShape = 16844042; // 0x101050a













    field public static final int pointerIcon = 16844042; // 0x101050a















    field public static final int popupAnimationStyle = 16843465; // 0x10102c9















    field public static final int popupBackground = 16843126; // 0x1010176















    field public static final int popupCharacters = 16843332; // 0x1010244










@@ -42013,35 +42013,35 @@ package android.view {













  }





























  public final class PointerIcon implements android.os.Parcelable {













    method public static android.view.PointerIcon createCustomIcon(android.graphics.Bitmap, float, float);













    method public static android.view.PointerIcon create(android.graphics.Bitmap, float, float);















    method public int describeContents();















    method public static android.view.PointerIcon getSystemIcon(android.content.Context, int);













    method public static android.view.PointerIcon loadCustomIcon(android.content.res.Resources, int);













    method public static android.view.PointerIcon load(android.content.res.Resources, int);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.view.PointerIcon> CREATOR;













    field public static final int STYLE_ALIAS = 1010; // 0x3f2













    field public static final int STYLE_ALL_SCROLL = 1013; // 0x3f5













    field public static final int STYLE_ARROW = 1000; // 0x3e8













    field public static final int STYLE_CELL = 1006; // 0x3ee













    field public static final int STYLE_CONTEXT_MENU = 1001; // 0x3e9













    field public static final int STYLE_COPY = 1011; // 0x3f3













    field public static final int STYLE_CROSSHAIR = 1007; // 0x3ef













    field public static final int STYLE_DEFAULT = 1000; // 0x3e8













    field public static final int STYLE_GRAB = 1020; // 0x3fc













    field public static final int STYLE_GRABBING = 1021; // 0x3fd













    field public static final int STYLE_HAND = 1002; // 0x3ea













    field public static final int STYLE_HELP = 1003; // 0x3eb













    field public static final int STYLE_HORIZONTAL_DOUBLE_ARROW = 1014; // 0x3f6













    field public static final int STYLE_NO_DROP = 1012; // 0x3f4













    field public static final int STYLE_NULL = 0; // 0x0













    field public static final int STYLE_TEXT = 1008; // 0x3f0













    field public static final int STYLE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW = 1017; // 0x3f9













    field public static final int STYLE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW = 1016; // 0x3f8













    field public static final int STYLE_VERTICAL_DOUBLE_ARROW = 1015; // 0x3f7













    field public static final int STYLE_VERTICAL_TEXT = 1009; // 0x3f1













    field public static final int STYLE_WAIT = 1004; // 0x3ec













    field public static final int STYLE_ZOOM_IN = 1018; // 0x3fa













    field public static final int STYLE_ZOOM_OUT = 1019; // 0x3fb













    field public static final int TYPE_ALIAS = 1010; // 0x3f2













    field public static final int TYPE_ALL_SCROLL = 1013; // 0x3f5













    field public static final int TYPE_ARROW = 1000; // 0x3e8













    field public static final int TYPE_CELL = 1006; // 0x3ee













    field public static final int TYPE_CONTEXT_MENU = 1001; // 0x3e9













    field public static final int TYPE_COPY = 1011; // 0x3f3













    field public static final int TYPE_CROSSHAIR = 1007; // 0x3ef













    field public static final int TYPE_DEFAULT = 1000; // 0x3e8













    field public static final int TYPE_GRAB = 1020; // 0x3fc













    field public static final int TYPE_GRABBING = 1021; // 0x3fd













    field public static final int TYPE_HAND = 1002; // 0x3ea













    field public static final int TYPE_HELP = 1003; // 0x3eb













    field public static final int TYPE_HORIZONTAL_DOUBLE_ARROW = 1014; // 0x3f6













    field public static final int TYPE_NO_DROP = 1012; // 0x3f4













    field public static final int TYPE_NULL = 0; // 0x0













    field public static final int TYPE_TEXT = 1008; // 0x3f0













    field public static final int TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW = 1017; // 0x3f9













    field public static final int TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW = 1016; // 0x3f8













    field public static final int TYPE_VERTICAL_DOUBLE_ARROW = 1015; // 0x3f7













    field public static final int TYPE_VERTICAL_TEXT = 1009; // 0x3f1













    field public static final int TYPE_WAIT = 1004; // 0x3ec













    field public static final int TYPE_ZOOM_IN = 1018; // 0x3fa













    field public static final int TYPE_ZOOM_OUT = 1019; // 0x3fb















  }





























  public class ScaleGestureDetector {










@@ -42407,7 +42407,7 @@ package android.view {













    method public android.view.ViewParent getParentForAccessibility();















    method public float getPivotX();















    method public float getPivotY();













    method public android.view.PointerIcon getPointerIcon(android.view.MotionEvent, float, float);













    method public android.view.PointerIcon getPointerIcon();















    method public android.content.res.Resources getResources();















    method public final int getRight();















    method protected float getRightFadingEdgeStrength();










@@ -42558,6 +42558,7 @@ package android.view {













    method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);















    method public void onProvideStructure(android.view.ViewStructure);















    method public void onProvideVirtualStructure(android.view.ViewStructure);













    method public android.view.PointerIcon onResolvePointerIcon(android.view.MotionEvent, int);















    method protected void onRestoreInstanceState(android.os.Parcelable);















    method public void onRtlPropertiesChanged(int);















    method protected android.os.Parcelable onSaveInstanceState();










@@ -42604,6 +42605,7 @@ package android.view {













    method public boolean requestFocus(int, android.graphics.Rect);















    method public final boolean requestFocusFromTouch();















    method public void requestLayout();













    method public void requestPointerCapture();















    method public boolean requestRectangleOnScreen(android.graphics.Rect);















    method public boolean requestRectangleOnScreen(android.graphics.Rect, boolean);















    method public final void requestUnbufferedDispatch(android.view.MotionEvent);










@@ -42694,7 +42696,6 @@ package android.view {













    method public void setPaddingRelative(int, int, int, int);















    method public void setPivotX(float);















    method public void setPivotY(float);













    method public void setPointerCapture();















    method public void setPointerIcon(android.view.PointerIcon);















    method public void setPressed(boolean);















    method public final void setRight(int);

























core/java/android/hardware/input/IInputManager.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -79,7 +79,7 @@ interface IInputManager {













    void vibrate(int deviceId, in long[] pattern, int repeat, IBinder token);















    void cancelVibrate(int deviceId, IBinder token);





























    void setPointerIconShape(int shapeId);













    void setPointerIconType(int typeId);















    void setCustomPointerIcon(in PointerIcon icon);































    void setPointerIconDetached(boolean detached);

































core/java/android/hardware/input/InputManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -872,13 +872,13 @@ public final class InputManager {













     * Changes the mouse pointer's icon shape into the specified id.















     *















     * @param iconId The id of the pointer graphic, as a value between













     * {@link PointerIcon.STYLE_ARROW} and {@link PointerIcon.STYLE_GRABBING}.













     * {@link PointerIcon.TYPE_ARROW} and {@link PointerIcon.TYPE_GRABBING}.















     *















     * @hide















     */













    public void setPointerIconShape(int iconId) {













    public void setPointerIconType(int iconId) {















        try {













            mIm.setPointerIconShape(iconId);













            mIm.setPointerIconType(iconId);















        } catch (RemoteException ex) {















            throw ex.rethrowFromSystemServer();















        }