diff options
| author | 2017-04-18 04:01:58 +0000 | |
|---|---|---|
| committer | 2017-04-18 04:02:03 +0000 | |
| commit | cf7cb9c99300f1c80f93aa3d55dac6db977db333 (patch) | |
| tree | 7ca285b5f6139a8a7daeed9284b93cb1b1519448 | |
| parent | 0c1b4769c778c3cd3627d0382efaf66d6b9ff402 (diff) | |
| parent | b11802197259019b016c84741fd5ae18a1b276c1 (diff) | |
Merge "Renamed ViewNode's getAutoFillHints() to getAutofillHints()" into oc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/assist/AssistStructure.java | 10 |
4 files changed, 13 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 4fc4bfc76854..8b9fbe11a0cc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6624,7 +6624,7 @@ package android.app.assist { public static class AssistStructure.ViewNode { method public float getAlpha(); - method public java.lang.String[] getAutoFillHints(); + method public java.lang.String[] getAutofillHints(); method public android.view.autofill.AutofillId getAutofillId(); method public java.lang.String[] getAutofillOptions(); method public int getAutofillType(); diff --git a/api/system-current.txt b/api/system-current.txt index db3792be653b..43dbb06298a7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6869,7 +6869,7 @@ package android.app.assist { public static class AssistStructure.ViewNode { method public float getAlpha(); - method public java.lang.String[] getAutoFillHints(); + method public java.lang.String[] getAutofillHints(); method public android.view.autofill.AutofillId getAutofillId(); method public java.lang.String[] getAutofillOptions(); method public int getAutofillType(); diff --git a/api/test-current.txt b/api/test-current.txt index f8a04d237d7c..fa3879814bc8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -6654,7 +6654,7 @@ package android.app.assist { public static class AssistStructure.ViewNode { method public float getAlpha(); - method public java.lang.String[] getAutoFillHints(); + method public java.lang.String[] getAutofillHints(); method public android.view.autofill.AutofillId getAutofillId(); method public java.lang.String[] getAutofillOptions(); method public int getAutofillType(); diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java index 545aef5224b7..9f911f5c19c3 100644 --- a/core/java/android/app/assist/AssistStructure.java +++ b/core/java/android/app/assist/AssistStructure.java @@ -964,6 +964,16 @@ public class AssistStructure implements Parcelable { * * @return The hints for this view */ + @Nullable public String[] getAutofillHints() { + return mAutofillHints; + } + + /** + * @hide + * @deprecated use getAutofillHints() instead. + */ + // TODO(b/33197203): remove once clients don't use it anymore... + @Deprecated @Nullable public String[] getAutoFillHints() { return mAutofillHints; } |