diff options
author | Shawn Pearce <sop@google.com> | 2013-03-12 23:01:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-12 23:01:53 +0000 |
commit | d665b49518d1952c2c32825782ff117a13bc7484 (patch) | |
tree | 2726d1f2966a9c869619f5d2476c335cdb1194a1 /api/current.txt | |
parent | adfd7c51981edcda404baeaa19fb388ad389e367 (diff) | |
parent | bc03a348d78326dee779a8ecc325799c9fceac98 (diff) | |
download | frameworks_base-d665b49518d1952c2c32825782ff117a13bc7484.zip frameworks_base-d665b49518d1952c2c32825782ff117a13bc7484.tar.gz frameworks_base-d665b49518d1952c2c32825782ff117a13bc7484.tar.bz2 |
Merge "Add new sensor types." into jb-mr2-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r-- | api/current.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 3132a91..4eb6a0b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10046,16 +10046,20 @@ package android.hardware { 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 + field public static final int TYPE_GAME_ROTATION_VECTOR = 15; // 0xf 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 field public static final int TYPE_LIGHT = 5; // 0x5 field public static final int TYPE_LINEAR_ACCELERATION = 10; // 0xa field public static final int TYPE_MAGNETIC_FIELD = 2; // 0x2 + field public static final int TYPE_MAGNETIC_FIELD_UNCALIBRATED = 14; // 0xe field public static final deprecated int TYPE_ORIENTATION = 3; // 0x3 field public static final int TYPE_PRESSURE = 6; // 0x6 field public static final int TYPE_PROXIMITY = 8; // 0x8 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 deprecated int TYPE_TEMPERATURE = 7; // 0x7 } @@ -10077,6 +10081,7 @@ package android.hardware { } public abstract class SensorManager { + method public boolean cancelTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor); method public static float getAltitude(float, float); method public static void getAngleChange(float[], float[], float[]); method public android.hardware.Sensor getDefaultSensor(int); @@ -10092,6 +10097,7 @@ package android.hardware { method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int); method public boolean registerListener(android.hardware.SensorEventListener, android.hardware.Sensor, int, android.os.Handler); method public static boolean remapCoordinateSystem(float[], int, int, float[]); + method public boolean requestTriggerSensor(android.hardware.TriggerEventListener, android.hardware.Sensor); method public deprecated void unregisterListener(android.hardware.SensorListener); method public deprecated void unregisterListener(android.hardware.SensorListener, int); method public void unregisterListener(android.hardware.SensorEventListener, android.hardware.Sensor); @@ -10155,6 +10161,17 @@ package android.hardware { field public static final float STANDARD_GRAVITY = 9.80665f; } + public final class TriggerEvent { + field public android.hardware.Sensor sensor; + field public long timestamp; + field public final float[] values; + } + + public abstract class TriggerEventListener { + ctor public TriggerEventListener(); + method public abstract void onTrigger(android.hardware.TriggerEvent); + } + } package android.hardware.display { |