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

Commit a50230be authored by Violetta Fedotova's avatar Violetta Fedotova Committed by Automerger Merge Worker
Browse files

Merge "Make MotionEvent.getEventTimeNano API public." into udc-dev am: 35943147 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21758380



Change-Id: Ifca0c24f33fb1b3bb69852607894207db2a5cbc8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1818a527 35943147

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -51293,10 +51293,12 @@ package android.view { 
    method public long getDownTime();

    method public int getEdgeFlags();

    method public long getEventTime();

    method public long getEventTimeNanos();

    method public int getFlags();

    method public float getHistoricalAxisValue(int, int);

    method public float getHistoricalAxisValue(int, int, int);

    method public long getHistoricalEventTime(int);

    method public long getHistoricalEventTimeNanos(int);

    method public float getHistoricalOrientation(int);

    method public float getHistoricalOrientation(int, int);

    method public void getHistoricalPointerCoords(int, int, android.view.MotionEvent.PointerCoords);

core/java/android/view/InputEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public abstract class InputEvent implements Parcelable { 
     *

     * @hide

     */

    public abstract long getEventTimeNano();

    public abstract long getEventTimeNanos();



    /**

     * Marks the input event as being canceled.

core/java/android/view/InputEventConsistencyVerifier.java

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ public final class InputEventConsistencyVerifier { 


    private static void appendEvent(StringBuilder message, int index,

            InputEvent event, boolean unhandled) {

        message.append(index).append(": sent at ").append(event.getEventTimeNano());

        message.append(index).append(": sent at ").append(event.getEventTimeNanos());

        message.append(", ");

        if (unhandled) {

            message.append("(unhandled) ");

core/java/android/view/KeyEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -2711,7 +2711,7 @@ public class KeyEvent extends InputEvent implements Parcelable { 
     * @hide

     */

    @Override

    public final long getEventTimeNano() {

    public final long getEventTimeNanos() {

        return mEventTime;

    }

core/java/android/view/MotionEvent.java

+21 −5
Original line number Diff line number Diff line
@@ -2440,12 +2440,30 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     *

     * @hide

     */

    @Override

    @UnsupportedAppUsage

    @UnsupportedAppUsage(publicAlternatives =

            "Use {@link #getEventTimeNanos()} public API instead.",

            maxTargetSdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    public final long getEventTimeNano() {

        return nativeGetEventTimeNanos(mNativePtr, HISTORY_CURRENT);

    }



    /**

     * Retrieve the time this event occurred,

     * in the {@link android.os.SystemClock#uptimeMillis} time base but with

     * nanosecond precision.

     * <p>

     * The value is in nanosecond precision but it may not have nanosecond accuracy.

     * </p>

     *

     * @return Returns the time this event occurred,

     * in the {@link android.os.SystemClock#uptimeMillis} time base but with

     * nanosecond precision.

     */

    @Override

    public long getEventTimeNanos() {

        return nativeGetEventTimeNanos(mNativePtr, HISTORY_CURRENT);

    }



    /**

     * Equivalent to {@link #getX(int)} for pointer index 0 (regardless of the

     * pointer identifier).
@@ -3104,10 +3122,8 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     *

     * @see #getHistorySize

     * @see #getEventTime

     *

     * @hide

     */

    public final long getHistoricalEventTimeNano(int pos) {

    public long getHistoricalEventTimeNanos(int pos) {

        return nativeGetEventTimeNanos(mNativePtr, pos);

    }