diff --git a/Adafruit_Sensor.h b/Adafruit_Sensor.h
index 6c155e5..cb3cd50 100644
--- a/Adafruit_Sensor.h
+++ b/Adafruit_Sensor.h
@@ -8,6 +8,20 @@
  #include "WProgram.h"
 #endif
 
+/* Intentionally modeled after sensors.h in the Android API:
+ * https://github.com/android/platform_hardware_libhardware/blob/master/include/hardware/sensors.h */
+
+/* Constants */
+#define SENSORS_GRAVITY_EARTH             (9.80665F)              /**< Earth's gravity in m/s^2 */
+#define SENSORS_GRAVITY_MOON              (1.6F)                  /**< The moon's gravity in m/s^2 */
+#define SENSORS_GRAVITY_SUN               (275.0F)                /**< The sun's gravity in m/s^2 */
+#define SENSORS_GRAVITY_STANDARD          (SENSORS_GRAVITY_EARTH)
+#define SENSORS_MAGFIELD_EARTH_MAX        (60.0F)                 /**< Maximum magnetic field on Earth's surface */
+#define SENSORS_MAGFIELD_EARTH_MIN        (30.0F)                 /**< Minimum magnetic field on Earth's surface */
+#define SENSORS_PRESSURE_SEALEVELHPA      (1013.25F)              /**< Average sea level pressure is 1013.25 hPa */
+#define SENSORS_DPS_TO_RADS               (0.017453293F)          /**< Degrees/s to rad/s multiplier */
+#define SENSORS_GAUSS_TO_MICROTESLA       (100)                   /**< Gauss to micro-Tesla multiplier */
+
 /** Sensor types */
 typedef enum
 {
@@ -24,7 +38,8 @@ typedef enum
   SENSOR_TYPE_RELATIVE_HUMIDITY     = (12),
   SENSOR_TYPE_AMBIENT_TEMPERATURE   = (13),
   SENSOR_TYPE_VOLTAGE               = (15),
-  SENSOR_TYPE_CURRENT               = (16)
+  SENSOR_TYPE_CURRENT               = (16),
+  SENSOR_TYPE_COLOR                 = (17)
 } sensors_type_t;
 
 /** struct sensors_vec_s is used to return a vector in a common format. */
@@ -47,7 +62,21 @@ typedef struct {
     uint8_t reserved[3];
 } sensors_vec_t;
 
-/* Sensor event (52 bytes) */
+/** struct sensors_color_s is used to return color data in a common format. */
+typedef struct {
+    union {
+        float c[3];
+        /* RGB color space */
+        struct {
+            float r;       /**< Red component */
+            float g;       /**< Green component */
+            float b;       /**< Blue component */
+        };
+    };
+    uint32_t rgba;         /**< 24-bit RGBA value */
+} sensors_color_t;
+
+/* Sensor event (36 bytes) */
 /** struct sensor_event_s is used to provide a single sensor event in a common format. */
 typedef struct
 {
@@ -70,11 +99,11 @@ typedef struct
         float           relative_humidity;    /**< relative humidity in percent */
         float           current;              /**< current in milliamps (mA) */
         float           voltage;              /**< voltage in volts (V) */
+        sensors_color_t color;                /**< color in RGB component values */
     };
-    uint32_t reserved1[4];
 } sensors_event_t;
 
-/* Sensor details (56 bytes) */
+/* Sensor details (40 bytes) */
 /** struct sensor_s is used to describe basic information about a specific sensor. */
 typedef struct
 {
@@ -86,7 +115,6 @@ typedef struct
     float    min_value;                       /**< minimum value of this sensor's value in SI units */
     float    resolution;                      /**< smallest difference between two values reported by this sensor */
     int32_t  min_delay;                       /**< min delay in microseconds between events. zero = not a constant rate */
-    void*    reserved[4];                     /**< reserved fields, must be zero */
 } sensor_t;
 
 class Adafruit_Sensor {