Projects >> platform_frameworks_base >>c6b7a0131e92a0bdeb268cee185404ceae9b54b7

Chunk
Conflicting content 
     */
    public static final int TYPE_ROTATION_VECTOR = 11;

<<<<<<< HEAD
    /** A constant describing an ambient temperature sensor type */
    public static final int TYPE_AMBIENT_TEMPERATURE = 13;
=======
    /**
     * A constant describing a relative humidity sensor type.
     * See {@link android.hardware.SensorEvent SensorEvent}
     * for more details.
     */
    public static final int TYPE_RELATIVE_HUMIDITY = 12;
>>>>>>> 111d17ce5141aa0fa51de37deae0811e70555d34

    /** 
     * A constant describing all sensor types.
Solution content 
     */
    public static final int TYPE_ROTATION_VECTOR = 11;

    /**
     * A constant describing a relative humidity sensor type.
     * See {@link android.hardware.SensorEvent SensorEvent}
     * for more details.
     */
    public static final int TYPE_RELATIVE_HUMIDITY = 12;

    /** A constant describing an ambient temperature sensor type */
    public static final int TYPE_AMBIENT_TEMPERATURE = 13;

    /** 
     * A constant describing all sensor types.
File
Sensor.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
     * 
     * in the clockwise direction (mathematically speaking, it should be
     * positive in the counter-clockwise direction).
     * 

<<<<<<< HEAD
     * 
     * 
{@link android.hardware.Sensor#TYPE_AMBIENT_TEMPERATURE Sensor.TYPE_AMBIENT_TEMPERATURE}:
     * 

     *
     * 
    
     * 
    
     * values[0]: ambient (room) temperature in degree Celsius.
     * 

=======
     *
     * 
{@link android.hardware.Sensor#TYPE_RELATIVE_HUMIDITY
     * Sensor.TYPE_RELATIVE_HUMIDITY}:

     * 
    
     * 
    
     * values[0]: Relative ambient air humidity in percent
     * 
    
     * 

     * 

     * When relative ambient air humidity and ambient temperature are
     * measured, the dew point and absolute humidity can be calculated.
     * 

     * Dew Point
     * 

     * The dew point is the temperature to which a given parcel of air must be
     * cooled, at constant barometric pressure, for water vapor to condense
     * into water.
     * 

     *                    ln(RH/100%) + m·t/(Tn+t)
     * td(t,RH) = Tn · ------------------------------
     *                 m - [ln(RH/100%) + m·t/(Tn+t)]
     * 

     * 

     * 
td
 
dew point temperature in °C

     * 
t
             
actual temperature in °C

     * 
RH
            
actual relative humidity in %

     * 
m
             
17.62

     * 
Tn
 
243.12 °C

     * 

     * 
for example:

     * 
     * h = Math.log(rh / 100.0) + (17.62 * t) / (243.12 + t);
     * td = 243.12 * h / (17.62 - h);
     * 

     * Absolute Humidity
     * 

     * The absolute humidity is the mass of water vapor in a particular volume
     * of dry air. The unit is g/m3.
     * 

     * 
     *                    RH/100%·A·exp(m·t/(Tn+t))
     * dv(t,RH) = 216.7 · -------------------------
     *                           273.15 + t
     * 

     * 

     * 
dv
 
absolute humidity in g/m3

     * 
t
             
actual temperature in °C

     * 
RH
            
actual relative humidity in %

     * 
m
             
17.62

     * 
Tn
 
243.12 °C

     * 
A
             
6.112 hPa

     * 

     * 
for example:

     * 
     * dv = 216.7 *
     * (rh / 100.0 * 6.112 * Math.exp(17.62 * t / (243.12 + t)) / (273.15 + t));
     * 

>>>>>>> 111d17ce5141aa0fa51de37deae0811e70555d34
     *
     * @see SensorEvent
     * @see GeomagneticField
Solution content 
     * in the clockwise direction (mathematically speaking, it should be
     * positive in the counter-clockwise direction).
     * 

     *
     * 
{@link android.hardware.Sensor#TYPE_RELATIVE_HUMIDITY
     * Sensor.TYPE_RELATIVE_HUMIDITY}:

     * 
    
     * 
    
     * values[0]: Relative ambient air humidity in percent
     * 
    
     * 

     * 

     * When relative ambient air humidity and ambient temperature are
     * measured, the dew point and absolute humidity can be calculated.
     * 

     * Dew Point
     * 

     * The dew point is the temperature to which a given parcel of air must be
     * cooled, at constant barometric pressure, for water vapor to condense
     * into water.
     * 

     * 
     *                    ln(RH/100%) + m·t/(Tn+t)
     * td(t,RH) = Tn · ------------------------------
     *                 m - [ln(RH/100%) + m·t/(Tn+t)]
     * 

     * 

     * 
td
 
dew point temperature in °C

     * 
t
             
actual temperature in °C

     * 
RH
            
actual relative humidity in %

     * 
m
             
17.62

     * 
Tn
 
243.12 °C

     * 

     * 
for example:

     * 
     * h = Math.log(rh / 100.0) + (17.62 * t) / (243.12 + t);
     * td = 243.12 * h / (17.62 - h);
     * 

     * Absolute Humidity
     * 

     * The absolute humidity is the mass of water vapor in a particular volume
     * of dry air. The unit is g/m3.
     * 

     * 
     *                    RH/100%·A·exp(m·t/(Tn+t))
     * dv(t,RH) = 216.7 · -------------------------
     *                           273.15 + t
     * 

     * 

     * 
dv
 
absolute humidity in g/m3

     * 
t
             
actual temperature in °C

     * 
RH
            
actual relative humidity in %

     * 
m
             
17.62

     * 
Tn
 
243.12 °C

     * 
A
             
6.112 hPa

     * 

     * 
for example:

     * 
     * dv = 216.7 *
     * (rh / 100.0 * 6.112 * Math.exp(17.62 * t / (243.12 + t)) / (273.15 + t));
     * 

     * 
     * 
{@link android.hardware.Sensor#TYPE_AMBIENT_TEMPERATURE Sensor.TYPE_AMBIENT_TEMPERATURE}:
     * 

     *
     * 
    
     * 
    
     * values[0]: ambient (room) temperature in degree Celsius.
     * 

     *
     * @see SensorEvent
     * @see GeomagneticField
File
SensorEvent.java
Developer's decision
Concatenation
Kind of conflict
Comment