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

Commit d262fb60 authored by Aravind Akella's avatar Aravind Akella Committed by Android Git Automerger
Browse files

am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and... 

am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR."

* commit '52df1db3':
  Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR.
parents cdd4269d 52df1db3

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -10536,6 +10536,7 @@ package android.hardware { 
    field public static final int TYPE_ALL = -1; // 0xffffffff

    field public static final int TYPE_AMBIENT_TEMPERATURE = 13; // 0xd

    field public static final int TYPE_GAME_ROTATION_VECTOR = 15; // 0xf

    field public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20; // 0x14

    field public static final int TYPE_GRAVITY = 9; // 0x9

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

    field public static final int TYPE_GYROSCOPE_UNCALIBRATED = 16; // 0x10
@@ -10549,6 +10550,8 @@ package android.hardware { 
    field public static final int TYPE_RELATIVE_HUMIDITY = 12; // 0xc

    field public static final int TYPE_ROTATION_VECTOR = 11; // 0xb

    field public static final int TYPE_SIGNIFICANT_MOTION = 17; // 0x11

    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

  }

























core/java/android/hardware/Sensor.java



+38
−2




























Original line number
Diff line number
Diff line








@@ -174,7 +174,7 @@ public final class Sensor {













    public static final int TYPE_GYROSCOPE_UNCALIBRATED = 16;































    /**













     * A constant describing the significant motion trigger sensor.













     * A constant describing a significant motion trigger sensor.















     * <p>















     * It triggers when an event occurs and then automatically disables















     * itself. The sensor continues to operate while the device is asleep









@@ -185,6 +185,42 @@ public final class Sensor {













     */















    public static final int TYPE_SIGNIFICANT_MOTION = 17;





























    /**













     * A constant describing a step detector sensor.













     * <p>













     * A sensor of this type triggers an event each time a step is taken by the user. The only













     * allowed value to return is 1.0 and an event is generated for each step. Like with any other













     * event, the timestamp indicates when the event (here the step) occurred, this corresponds to













     * when the foot hit the ground, generating a high variation in acceleration.













     * <p>













     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.













     */













    public static final int TYPE_STEP_DETECTOR = 18;



























    /**













     * A constant describing a step counter sensor.













     * <p>













     * A sensor of this type returns the number of steps taken by the user since the last reboot













     * while activated. The value is returned as a float (with the fractional part set to zero) and













     * is reset to zero only on a system reboot. The timestamp of the event is set to the time when













     * the first step for that event was taken. This sensor is implemented in hardware and is













     * expected to be low power.













     * <p>













     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.













     */













    public static final int TYPE_STEP_COUNTER = 19;



























    /**













     * A constant describing the geo-magnetic rotation vector.













     * <p>













     * Similar to {@link #SENSOR_TYPE_ROTATION_VECTOR}, but using a magnetometer instead of using a













     * gyroscope. This sensor uses lower power than the other rotation vectors, because it doesn't













     * use the gyroscope. However, it is more noisy and will work best outdoors.













     * <p>













     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.













     */













    public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20;





























    /**















     * A constant describing all sensor types.















     */