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

Commit 7e1e6b00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Expose SPIN and THUD vibration effects to public" into sc-dev am: fc2b8f7e 

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

Change-Id: Ie137f7801d572bc1942643b3a2818cca7072ae6b
parents de138861 fc2b8f7e

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -32066,6 +32066,8 @@ package android.os { 
    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

    field public static final int PRIMITIVE_SPIN = 3; // 0x3

    field public static final int PRIMITIVE_THUD = 2; // 0x2

    field public static final int PRIMITIVE_TICK = 7; // 0x7

  }

























core/java/android/os/VibrationEffect.java



+0
−4






























Original line number
Diff line number
Diff line







@@ -749,14 +749,10 @@ public abstract class VibrationEffect implements Parcelable {







         * A haptic effect that simulates downwards movement with gravity. Often









         * followed by extra energy of hitting and reverberation to augment









         * physicality.









         *









         * @hide Not confident enough to expose publicly yet









         */









        public static final int PRIMITIVE_THUD = 2;









        /**









         * A haptic effect that simulates spinning momentum.









         *









         * @hide Not confident enough to expose publicly yet









         */









        public static final int PRIMITIVE_SPIN = 3;









        /**