commit 6da42980881c9906f7bfdcb93cf0dabdf3458c98
author Aurimas Liutikas <aurimas@google.com> Fri Jul 21 18:12:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 21 18:12:08 2017 +0000
tree 993971eda262dd32d9265cfd06cbb83cb1143808
parent 7f275afa2b54553c9a213f77322d73b2aaf1781e
parent bb11e821ebb33a36189eadb53b6c24d0a32cfa0b

Merge "Properly deprecate RemoteInputCompatBase and all its contents." into oc-support-26.1-dev
am: bb11e821eb

Change-Id: Id944974db4ac56ed6ab59705d971cc1f31e188cc

api/26.1.0-SNAPSHOT.txt

diff --git a/api/26.1.0-SNAPSHOT.txt b/api/26.1.0-SNAPSHOT.txt
index 13c52ca..338e280 100644
--- a/api/26.1.0-SNAPSHOT.txt
+++ b/api/26.1.0-SNAPSHOT.txt
@@ -6765,14 +6765,14 @@
    deprecated class RemoteInputCompatBase {
   }
 
-  public static abstract class RemoteInputCompatBase.RemoteInput {
-    ctor public RemoteInputCompatBase.RemoteInput();
-    method protected abstract boolean getAllowFreeFormInput();
-    method protected abstract java.util.Set<java.lang.String> getAllowedDataTypes();
-    method protected abstract java.lang.CharSequence[] getChoices();
-    method protected abstract android.os.Bundle getExtras();
-    method protected abstract java.lang.CharSequence getLabel();
-    method protected abstract java.lang.String getResultKey();
+  public static abstract deprecated class RemoteInputCompatBase.RemoteInput {
+    ctor public deprecated RemoteInputCompatBase.RemoteInput();
+    method protected abstract deprecated boolean getAllowFreeFormInput();
+    method protected abstract deprecated java.util.Set<java.lang.String> getAllowedDataTypes();
+    method protected abstract deprecated java.lang.CharSequence[] getChoices();
+    method protected abstract deprecated android.os.Bundle getExtras();
+    method protected abstract deprecated java.lang.CharSequence getLabel();
+    method protected abstract deprecated java.lang.String getResultKey();
   }
 
   public final class ServiceCompat {

compat/api/26.1.0-SNAPSHOT.txt

diff --git a/compat/api/26.1.0-SNAPSHOT.txt b/compat/api/26.1.0-SNAPSHOT.txt
index d6f02b4..b3b5173 100644
--- a/compat/api/26.1.0-SNAPSHOT.txt
+++ b/compat/api/26.1.0-SNAPSHOT.txt
@@ -525,14 +525,14 @@
    deprecated class RemoteInputCompatBase {
   }
 
-  public static abstract class RemoteInputCompatBase.RemoteInput {
-    ctor public RemoteInputCompatBase.RemoteInput();
-    method protected abstract boolean getAllowFreeFormInput();
-    method protected abstract java.util.Set<java.lang.String> getAllowedDataTypes();
-    method protected abstract java.lang.CharSequence[] getChoices();
-    method protected abstract android.os.Bundle getExtras();
-    method protected abstract java.lang.CharSequence getLabel();
-    method protected abstract java.lang.String getResultKey();
+  public static abstract deprecated class RemoteInputCompatBase.RemoteInput {
+    ctor public deprecated RemoteInputCompatBase.RemoteInput();
+    method protected abstract deprecated boolean getAllowFreeFormInput();
+    method protected abstract deprecated java.util.Set<java.lang.String> getAllowedDataTypes();
+    method protected abstract deprecated java.lang.CharSequence[] getChoices();
+    method protected abstract deprecated android.os.Bundle getExtras();
+    method protected abstract deprecated java.lang.CharSequence getLabel();
+    method protected abstract deprecated java.lang.String getResultKey();
   }
 
   public final class ServiceCompat {

compat/ics/android/support/v4/app/RemoteInputCompatBase.java

diff --git a/compat/ics/android/support/v4/app/RemoteInputCompatBase.java b/compat/ics/android/support/v4/app/RemoteInputCompatBase.java
index 09c3429..fa7f7b6 100644
--- a/compat/ics/android/support/v4/app/RemoteInputCompatBase.java
+++ b/compat/ics/android/support/v4/app/RemoteInputCompatBase.java
@@ -26,14 +26,57 @@
 @Deprecated
 class RemoteInputCompatBase {
 
+    /**
+     * @deprecated This class was not meant to be made public.
+     */
+    @Deprecated
     public abstract static class RemoteInput {
+        /**
+         * @deprecated This method was not meant to be made public.
+         */
+        @Deprecated
+        public RemoteInput() {}
+
+        /**
+         * @deprecated This method was not meant to be made public.
+         */
+        @Deprecated
         protected abstract String getResultKey();
+
+        /**
+         * @deprecated This method was not meant to be made public.
+         */
+        @Deprecated
         protected abstract CharSequence getLabel();
+
+        /**
+         * @deprecated This method was not meant to be made public.
+         */
+        @Deprecated
         protected abstract CharSequence[] getChoices();
+
+        /**
+         * @deprecated This method was not meant to be made public.
+         */
+        @Deprecated
         protected abstract boolean getAllowFreeFormInput();
+
+        /**
+         * @deprecated This method was not meant to be made public.
+         */
+        @Deprecated
         protected abstract Bundle getExtras();
+
+        /**
+         * @deprecated This method was not meant to be made public.
+         */
+        @Deprecated
         protected abstract Set<String> getAllowedDataTypes();
 
+        /**
+         * @deprecated This class was not meant to be made public.
+         */
+        @Deprecated
         public interface Factory {
             RemoteInput build(String resultKey, CharSequence label,
                     CharSequence[] choices, boolean allowFreeFormInput, Bundle extras,