diff options
author | Alan Viverette <alanv@google.com> | 2014-09-12 01:30:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 01:30:35 +0000 |
commit | e461d549bf571fcca7698d1b5e7da71310e0998d (patch) | |
tree | a8f68a7f4c10f68bfe37dabc3a987aba8fd1e25e /api | |
parent | e9939c110ecfe5d26950e3aab940504a054cfa40 (diff) | |
parent | 5171dee2152758f307c9a1d70396fa79a921aef5 (diff) | |
download | frameworks_base-e461d549bf571fcca7698d1b5e7da71310e0998d.zip frameworks_base-e461d549bf571fcca7698d1b5e7da71310e0998d.tar.gz frameworks_base-e461d549bf571fcca7698d1b5e7da71310e0998d.tar.bz2 |
Merge "Remove unsafe methods that take TypedArray" into lmp-dev
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 2 | ||||
-rw-r--r-- | api/removed.txt | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 04ddcba..96aac9b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39119,9 +39119,7 @@ package android.widget { method public float getShadowRadius(); method public final boolean getShowSoftInputOnFocus(); method public java.lang.CharSequence getText(); - method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int); method public final android.content.res.ColorStateList getTextColors(); - method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray); method public java.util.Locale getTextLocale(); method public float getTextScaleX(); method public float getTextSize(); diff --git a/api/removed.txt b/api/removed.txt index 3f2a5a5..527f6c2 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -70,3 +70,12 @@ package android.view.inputmethod { } +package android.widget { + + public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener { + method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int); + method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray); + } + +} + |