diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/Uri.java | 10 | ||||
| -rw-r--r-- | core/java/android/text/InputType.java | 20 |
2 files changed, 25 insertions, 5 deletions
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java index 298be3b..9a1b65d 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java @@ -1028,7 +1028,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { } private String parseHost() { - String authority = getAuthority(); + String authority = getEncodedAuthority(); if (authority == null) { return null; } @@ -1037,9 +1037,11 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { int userInfoSeparator = authority.indexOf('@'); int portSeparator = authority.indexOf(':', userInfoSeparator); - return portSeparator == NOT_FOUND + String encodedHost = portSeparator == NOT_FOUND ? authority.substring(userInfoSeparator + 1) : authority.substring(userInfoSeparator + 1, portSeparator); + + return decode(encodedHost); } private volatile int port = NOT_CALCULATED; @@ -1051,7 +1053,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { } private int parsePort() { - String authority = getAuthority(); + String authority = getEncodedAuthority(); if (authority == null) { return -1; } @@ -1065,7 +1067,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { return -1; } - String portString = authority.substring(portSeparator + 1); + String portString = decode(authority.substring(portSeparator + 1)); try { return Integer.parseInt(portString); } catch (NumberFormatException e) { diff --git a/core/java/android/text/InputType.java b/core/java/android/text/InputType.java index 14b8308..8592221 100644 --- a/core/java/android/text/InputType.java +++ b/core/java/android/text/InputType.java @@ -20,7 +20,25 @@ import android.text.TextUtils; /** * Bit definitions for an integer defining the basic content type of text - * held in an {@link Editable} object. + * held in an {@link Editable} object. Supported classes may be combined + * with variations and flags to indicate desired behaviors. + * + * <h3>Examples</h3> + * + * <dl> + * <dt>A password field with with the password visible to the user: + * <dd>inputType = TYPE_CLASS_TEXT | + * TYPE_TEXT_VARIATION_VISIBLE_PASSWORD + * + * <dt>A multi-line postal address with automatic capitalization: + * <dd>inputType = TYPE_CLASS_TEXT | + * TYPE_TEXT_VARIATION_POSTAL_ADDRESS | + * TYPE_TEXT_FLAG_MULTI_LINE + * + * <dt>A time field: + * <dd>inputType = TYPE_CLASS_DATETIME | + * TYPE_DATETIME_VARIATION_TIME + * </dl> */ public interface InputType { /** |