diff options
| author | 2014-01-28 00:13:12 +0000 | |
|---|---|---|
| committer | 2014-01-28 00:13:12 +0000 | |
| commit | d16c409e55e3d0fbe3e6d18ceca5806415ed1c92 (patch) | |
| tree | 62ccdd91e5c0d24dc223829f0c93269705700cdd | |
| parent | db7516e3bd24589525c42b9b4761381b547dc3be (diff) | |
| parent | 065d998a4c3d597e924f42635d1a3699a6fcf34b (diff) | |
am 065d998a: Merge "Hide an old debug function." into klp-modular-dev
* commit '065d998a4c3d597e924f42635d1a3699a6fcf34b':
Hide an old debug function.
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/util/TypedValue.java | 16 |
2 files changed, 6 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index fd901f2f53bf..52900c96b631 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27211,7 +27211,6 @@ package android.util { method public final java.lang.CharSequence coerceToString(); method public static final java.lang.String coerceToString(int, int); method public static float complexToDimension(int, android.util.DisplayMetrics); - method public static float complexToDimensionNoisy(int, android.util.DisplayMetrics); method public static int complexToDimensionPixelOffset(int, android.util.DisplayMetrics); method public static int complexToDimensionPixelSize(int, android.util.DisplayMetrics); method public static float complexToFloat(int); diff --git a/core/java/android/util/TypedValue.java b/core/java/android/util/TypedValue.java index ed4529851d8f..931fb8114716 100644 --- a/core/java/android/util/TypedValue.java +++ b/core/java/android/util/TypedValue.java @@ -290,18 +290,14 @@ public class TypedValue { return -1; } + /** + * @hide Was accidentally exposed in API level 1 for debugging purposes. + * Kept for compatibility just in case although the debugging code has been removed. + */ + @Deprecated public static float complexToDimensionNoisy(int data, DisplayMetrics metrics) { - float res = complexToDimension(data, metrics); - System.out.println( - "Dimension (0x" + ((data>>TypedValue.COMPLEX_MANTISSA_SHIFT) - & TypedValue.COMPLEX_MANTISSA_MASK) - + "*" + (RADIX_MULTS[(data>>TypedValue.COMPLEX_RADIX_SHIFT) - & TypedValue.COMPLEX_RADIX_MASK] / MANTISSA_MULT) - + ")" + DIMENSION_UNIT_STRS[(data>>COMPLEX_UNIT_SHIFT) - & COMPLEX_UNIT_MASK] - + " = " + res); - return res; + return complexToDimension(data, metrics); } /** |