summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
authorChristopher Lane <lanechr@google.com>2014-10-31 22:07:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-31 22:07:30 +0000
commitc56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96 (patch)
tree1d9a21d5a3950180295ed76762779faf8cc79fe9 /core/java/android/util
parent0d6624d35af7c7623cf97084753255079b01fbdf (diff)
parent38d6cf9cbee98b3fe66e6ccda223b3c4c01a0815 (diff)
downloadframeworks_base-c56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96.zip
frameworks_base-c56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96.tar.gz
frameworks_base-c56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96.tar.bz2
am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev
automerge: 38d6cf9 * commit '38d6cf9cbee98b3fe66e6ccda223b3c4c01a0815': Add convenience method for getting the complex unit type
Diffstat (limited to 'core/java/android/util')
-rw-r--r--core/java/android/util/TypedValue.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/util/TypedValue.java b/core/java/android/util/TypedValue.java
index d42ed03..74d4245 100644
--- a/core/java/android/util/TypedValue.java
+++ b/core/java/android/util/TypedValue.java
@@ -312,6 +312,18 @@ public class TypedValue {
}
/**
+ * 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>
* are as in {@link #TYPE_DIMENSION}.