diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-31 00:25:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 00:25:37 +0000 |
| commit | f2ae40739a8aa5b4a48427685a66292c930f6fa0 (patch) | |
| tree | bc4d5c35c86c1d25f8e308cb34b7fa65cdec61d7 /core/java/android/util | |
| parent | 2929579d20cd036305c764a66a2623b954327b05 (diff) | |
| parent | 9a77c8a279bfe3293295ed77c775ea29b88b2916 (diff) | |
| download | frameworks_base-f2ae40739a8aa5b4a48427685a66292c930f6fa0.zip frameworks_base-f2ae40739a8aa5b4a48427685a66292c930f6fa0.tar.gz frameworks_base-f2ae40739a8aa5b4a48427685a66292c930f6fa0.tar.bz2 | |
am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
Distinguish unspecified and explicit null values in resources
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/TypedValue.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/util/TypedValue.java b/core/java/android/util/TypedValue.java index 931fb81..d42ed03 100644 --- a/core/java/android/util/TypedValue.java +++ b/core/java/android/util/TypedValue.java @@ -139,6 +139,17 @@ public class TypedValue { /* ------------------------------------------------------------ */ /** + * {@link #TYPE_NULL} data indicating the value was not specified. + */ + public static final int DATA_NULL_UNDEFINED = 0; + /** + * {@link #TYPE_NULL} data indicating the value was explicitly set to null. + */ + public static final int DATA_NULL_EMPTY = 1; + + /* ------------------------------------------------------------ */ + + /** * If {@link #density} is equal to this value, then the density should be * treated as the system's default density value: {@link DisplayMetrics#DENSITY_DEFAULT}. */ |