Merge "Deprecate LoginFilter"
diff --git a/api/current.txt b/api/current.txt
index bde490c..80cc14c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -46305,30 +46305,30 @@
public static class Layout.Directions {
}
- public abstract class LoginFilter implements android.text.InputFilter {
- method public CharSequence filter(CharSequence, int, int, android.text.Spanned, int, int);
- method public abstract boolean isAllowed(char);
- method public void onInvalidCharacter(char);
- method public void onStart();
- method public void onStop();
+ @Deprecated public abstract class LoginFilter implements android.text.InputFilter {
+ method @Deprecated public CharSequence filter(CharSequence, int, int, android.text.Spanned, int, int);
+ method @Deprecated public abstract boolean isAllowed(char);
+ method @Deprecated public void onInvalidCharacter(char);
+ method @Deprecated public void onStart();
+ method @Deprecated public void onStop();
}
- public static class LoginFilter.PasswordFilterGMail extends android.text.LoginFilter {
- ctor public LoginFilter.PasswordFilterGMail();
- ctor public LoginFilter.PasswordFilterGMail(boolean);
- method public boolean isAllowed(char);
+ @Deprecated public static class LoginFilter.PasswordFilterGMail extends android.text.LoginFilter {
+ ctor @Deprecated public LoginFilter.PasswordFilterGMail();
+ ctor @Deprecated public LoginFilter.PasswordFilterGMail(boolean);
+ method @Deprecated public boolean isAllowed(char);
}
- public static class LoginFilter.UsernameFilterGMail extends android.text.LoginFilter {
- ctor public LoginFilter.UsernameFilterGMail();
- ctor public LoginFilter.UsernameFilterGMail(boolean);
- method public boolean isAllowed(char);
+ @Deprecated public static class LoginFilter.UsernameFilterGMail extends android.text.LoginFilter {
+ ctor @Deprecated public LoginFilter.UsernameFilterGMail();
+ ctor @Deprecated public LoginFilter.UsernameFilterGMail(boolean);
+ method @Deprecated public boolean isAllowed(char);
}
- public static class LoginFilter.UsernameFilterGeneric extends android.text.LoginFilter {
- ctor public LoginFilter.UsernameFilterGeneric();
- ctor public LoginFilter.UsernameFilterGeneric(boolean);
- method public boolean isAllowed(char);
+ @Deprecated public static class LoginFilter.UsernameFilterGeneric extends android.text.LoginFilter {
+ ctor @Deprecated public LoginFilter.UsernameFilterGeneric();
+ ctor @Deprecated public LoginFilter.UsernameFilterGeneric(boolean);
+ method @Deprecated public boolean isAllowed(char);
}
public interface NoCopySpan {
diff --git a/core/java/android/text/LoginFilter.java b/core/java/android/text/LoginFilter.java
index e2d1596..0e4eec44 100644
--- a/core/java/android/text/LoginFilter.java
+++ b/core/java/android/text/LoginFilter.java
@@ -19,7 +19,10 @@
/**
* Abstract class for filtering login-related text (user names and passwords)
*
+ * @deprecated Password requirements should not be hardcoded in clients. This class also does not
+ * handle non-BMP characters.
*/
+@Deprecated
public abstract class LoginFilter implements InputFilter {
private boolean mAppendInvalid; // whether to append or ignore invalid characters
/**
@@ -130,7 +133,9 @@
* account creation. It prevents the user from entering user names with characters other than
* [a-zA-Z0-9.].
*
+ * @deprecated Do not encode assumptions about Google account names into client applications.
*/
+ @Deprecated
public static class UsernameFilterGMail extends LoginFilter {
public UsernameFilterGMail() {
@@ -190,8 +195,12 @@
/**
* This filter is compatible with GMail passwords which restricts characters to
* the Latin-1 (ISO8859-1) char set.
- *
+ *
+ * @deprecated Do not handle a user's Google password. Refer to
+ * <a href="https://support.google.com/accounts/answer/32040">Google Help</a> for
+ * password restriction information.
*/
+ @Deprecated
public static class PasswordFilterGMail extends LoginFilter {
public PasswordFilterGMail() {