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

Commit c56a9d10 authored by Christopher Lane's avatar Christopher Lane Committed by android-build-merger
Browse files

am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 

automerge: 38d6cf9c

* commit '38d6cf9c':
  Add convenience method for getting the complex unit type
parents 0d6624d3 38d6cf9c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32157,6 +32157,7 @@ package android.util { 
    method public static int complexToDimensionPixelSize(int, android.util.DisplayMetrics);

    method public static float complexToFloat(int);

    method public static float complexToFraction(int, float, float);

    method public int getComplexUnit();

    method public float getDimension(android.util.DisplayMetrics);

    method public final float getFloat();

    method public float getFraction(float, float);

core/java/android/util/TypedValue.java

+12 −0
Original line number Diff line number Diff line
@@ -311,6 +311,18 @@ public class TypedValue { 
        return complexToDimension(data, metrics);

    }



    /**

     * Return the complex unit type for this value. For example, a dimen type

     * with value 12sp will return {@link #COMPLEX_UNIT_SP}. Only use for values

     * whose type is {@link #TYPE_DIMENSION}.

     *

     * @return The complex unit type.

     */

     public int getComplexUnit()

     {

         return COMPLEX_UNIT_MASK & (data>>TypedValue.COMPLEX_UNIT_SHIFT);

     }



    /**

     * Converts an unpacked complex data value holding a dimension to its final floating 

     * point value. The two parameters <var>unit</var> and <var>value</var>