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

Commit 9eb7e9fe authored by Vince Leung's avatar Vince Leung
Browse files

Add PRIMITIVE_LOW_TICK VibrationEffect 

Bug: 174561580
Change-Id: I553a06b6dfb9d4a743d6aa1a6b0b728d90dbeee1
parent 2f1258d2

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31335,6 +31335,7 @@ package android.os { 
    method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);

    method @NonNull public android.os.VibrationEffect compose();

    field public static final int PRIMITIVE_CLICK = 1; // 0x1

    field public static final int PRIMITIVE_LOW_TICK = 8; // 0x8

    field public static final int PRIMITIVE_QUICK_FALL = 6; // 0x6

    field public static final int PRIMITIVE_QUICK_RISE = 4; // 0x4

    field public static final int PRIMITIVE_SLOW_RISE = 5; // 0x5

core/java/android/os/VibrationEffect.java

+10 −1
Original line number Diff line number Diff line
@@ -1071,6 +1071,7 @@ public abstract class VibrationEffect implements Parcelable { 
                PRIMITIVE_SLOW_RISE,

                PRIMITIVE_QUICK_FALL,

                PRIMITIVE_TICK,

                PRIMITIVE_LOW_TICK,

        })

        @Retention(RetentionPolicy.SOURCE)

        public @interface Primitive {}
@@ -1116,6 +1117,12 @@ public abstract class VibrationEffect implements Parcelable { 
         */

        // Internally this maps to the HAL constant CompositePrimitive::LIGHT_TICK

        public static final int PRIMITIVE_TICK = 7;

        /**

         * This very short low frequency effect should produce a light crisp sensation

         * intended to be used repetitively for dynamic feedback.

         */

        // Internally this maps to the HAL constant CompositePrimitive::LOW_TICK

        public static final int PRIMITIVE_LOW_TICK = 8;





        private ArrayList<PrimitiveEffect> mEffects = new ArrayList<>();
@@ -1194,7 +1201,7 @@ public abstract class VibrationEffect implements Parcelable { 
         *

         */

        static int checkPrimitive(int primitiveId) {

            Preconditions.checkArgumentInRange(primitiveId, PRIMITIVE_NOOP, PRIMITIVE_TICK,

            Preconditions.checkArgumentInRange(primitiveId, PRIMITIVE_NOOP, PRIMITIVE_LOW_TICK,

                    "primitiveId");

            return primitiveId;

        }
@@ -1223,6 +1230,8 @@ public abstract class VibrationEffect implements Parcelable { 
                    return "PRIMITIVE_QUICK_FALL";

                case PRIMITIVE_TICK:

                    return "PRIMITIVE_TICK";

                case PRIMITIVE_LOW_TICK:

                    return "PRIMITIVE_LOW_TICK";

                default:

                    return Integer.toString(id);

            }