Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PRIMITIVE_LOW_TICK VibrationEffect"

Browse Source
This commit is contained in:
Vince Leung
2021-01-12 07:17:54 +00:00
committed by Android (Google) Code Review
parent adb7d3e4c2 9eb7e9fe2d
commit 7b2e3fe338
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -31432,6 +31432,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

11
core/java/android/os/VibrationEffect.java
View File

@@ -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);
}