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

Commit 5ff57115 authored by Nick Vaccaro's avatar Nick Vaccaro Committed by Android Git Automerger
Browse files

am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and... 

am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev

* commit 'd0d13d82':
  Update API to contain new wrist tilt sensor type and string.
parents fb14e77f d0d13d82

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -12713,6 +12713,7 @@ package android.hardware { 
    field public static final java.lang.String STRING_TYPE_STEP_COUNTER = "android.sensor.step_counter";

    field public static final java.lang.String STRING_TYPE_STEP_DETECTOR = "android.sensor.step_detector";

    field public static final deprecated java.lang.String STRING_TYPE_TEMPERATURE = "android.sensor.temperature";

    field public static final java.lang.String STRING_TYPE_WRIST_TILT_GESTURE = "android.sensor.wrist_tilt_gesture";

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

    field public static final int TYPE_ALL = -1; // 0xffffffff

    field public static final int TYPE_AMBIENT_TEMPERATURE = 13; // 0xd
@@ -12735,6 +12736,7 @@ package android.hardware { 
    field public static final int TYPE_STEP_COUNTER = 19; // 0x13

    field public static final int TYPE_STEP_DETECTOR = 18; // 0x12

    field public static final deprecated int TYPE_TEMPERATURE = 7; // 0x7

    field public static final int TYPE_WRIST_TILT_GESTURE = 26; // 0x1a

  }















  public class SensorEvent {

























core/java/android/hardware/Sensor.java



+23
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@













package android.hardware;































import android.os.Build;













import android.annotation.SystemApi;































/**















 * Class representing a sensor. Use {@link SensorManager#getSensorList} to get










@@ -511,6 +512,27 @@ public final class Sensor {













     */















    public static final String STRING_TYPE_PICK_UP_GESTURE = "android.sensor.pick_up_gesture";





























     /**













     * A constant describing a wrist tilt gesture sensor.













     *













     * A sensor of this type triggers when the device face is tilted towards the user.













     * The only allowed return value is 1.0.













     * This sensor remains active until disabled.













     *













     * @hide This sensor is expected to only be used by the system ui













     */













    @SystemApi













    public static final int TYPE_WRIST_TILT_GESTURE = 26;



























    /**













     * A constant string describing a wrist tilt gesture sensor.













     *













     * @hide This sensor is expected to only be used by the system ui













     * @see #TYPE_WRIST_TILT_GESTURE













     */













    @SystemApi













    public static final String STRING_TYPE_WRIST_TILT_GESTURE = "android.sensor.wrist_tilt_gesture";





























    /**















     * A constant describing all sensor types.















     */










@@ -591,6 +613,7 @@ public final class Sensor {













            1, // SENSOR_TYPE_WAKE_GESTURE















            1, // SENSOR_TYPE_GLANCE_GESTURE















            1, // SENSOR_TYPE_PICK_UP_GESTURE













            1, // SENSOR_TYPE_WRIST_TILT_GESTURE















    };































    /**

































core/java/android/hardware/SensorManager.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -451,7 +451,8 @@ public abstract class SensorManager {













        // non_wake-up version.















        if (type == Sensor.TYPE_PROXIMITY || type == Sensor.TYPE_SIGNIFICANT_MOTION ||















                type == Sensor.TYPE_TILT_DETECTOR || type == Sensor.TYPE_WAKE_GESTURE ||













                type == Sensor.TYPE_GLANCE_GESTURE || type == Sensor.TYPE_PICK_UP_GESTURE) {













                type == Sensor.TYPE_GLANCE_GESTURE || type == Sensor.TYPE_PICK_UP_GESTURE ||













                type == Sensor.TYPE_WRIST_TILT_GESTURE) {















            wakeUpSensor = true;















        }