Merge "Hide an old debug function." into klp-modular-dev

This commit is contained in:
Jeff Brown
2014-01-28 00:09:06 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 11 deletions

View File

@@ -26184,7 +26184,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);

View File

@@ -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);
}
/**