commit cf7cb9c99300f1c80f93aa3d55dac6db977db333
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 18 04:01:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 18 04:02:03 2017 +0000
tree 7ca285b5f6139a8a7daeed9284b93cb1b1519448
parent 0c1b4769c778c3cd3627d0382efaf66d6b9ff402
parent b11802197259019b016c84741fd5ae18a1b276c1

Merge "Renamed ViewNode's getAutoFillHints() to getAutofillHints()" into oc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 4fc4bfc..8b9fbe1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6624,7 +6624,7 @@
 
   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();

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index db3792b..43dbb06 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6869,7 +6869,7 @@
 
   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();

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index f8a04d2..fa38798 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -6654,7 +6654,7 @@
 
   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();

core/java/android/app/assist/AssistStructure.java

diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java
index 545aef5..9f911f5 100644
--- a/core/java/android/app/assist/AssistStructure.java
+++ b/core/java/android/app/assist/AssistStructure.java
@@ -964,6 +964,16 @@
          *
          * @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;
         }