Unhides TvExtender in NotificationCompat

Bug: 235376322
Test: Unit tests added in previous change; this just unhides API
Relnote: Unhides NotificationCompat.TvExtender
Change-Id: Ibe13aa2cad4d3386e9a57cc6c515eac7efc36ce8

diff --git a/core/core/api/current.txt b/core/core/api/current.txt
index 10151bf..29ceae5 100644
--- a/core/core/api/current.txt
+++ b/core/core/api/current.txt

@@ -699,6 +699,21 @@
     method public void setBuilder(androidx.core.app.NotificationCompat.Builder?);
   }
 
+  public static final class NotificationCompat.TvExtender implements androidx.core.app.NotificationCompat.Extender {
+    ctor public NotificationCompat.TvExtender();
+    ctor public NotificationCompat.TvExtender(android.app.Notification);
+    method public androidx.core.app.NotificationCompat.Builder extend(androidx.core.app.NotificationCompat.Builder);
+    method public String? getChannelId();
+    method public android.app.PendingIntent? getContentIntent();
+    method public android.app.PendingIntent? getDeleteIntent();
+    method public boolean isAvailableOnTv();
+    method public boolean isSuppressShowOverApps();
+    method public androidx.core.app.NotificationCompat.TvExtender setChannelId(String?);
+    method public androidx.core.app.NotificationCompat.TvExtender setContentIntent(android.app.PendingIntent?);
+    method public androidx.core.app.NotificationCompat.TvExtender setDeleteIntent(android.app.PendingIntent?);
+    method public androidx.core.app.NotificationCompat.TvExtender setSuppressShowOverApps(boolean);
+  }
+
   public static final class NotificationCompat.WearableExtender implements androidx.core.app.NotificationCompat.Extender {
     ctor public NotificationCompat.WearableExtender();
     ctor public NotificationCompat.WearableExtender(android.app.Notification);

diff --git a/core/core/api/public_plus_experimental_current.txt b/core/core/api/public_plus_experimental_current.txt
index e3ef91e8..e9aa6cc 100644
--- a/core/core/api/public_plus_experimental_current.txt
+++ b/core/core/api/public_plus_experimental_current.txt

@@ -699,6 +699,21 @@
     method public void setBuilder(androidx.core.app.NotificationCompat.Builder?);
   }
 
+  public static final class NotificationCompat.TvExtender implements androidx.core.app.NotificationCompat.Extender {
+    ctor public NotificationCompat.TvExtender();
+    ctor public NotificationCompat.TvExtender(android.app.Notification);
+    method public androidx.core.app.NotificationCompat.Builder extend(androidx.core.app.NotificationCompat.Builder);
+    method public String? getChannelId();
+    method public android.app.PendingIntent? getContentIntent();
+    method public android.app.PendingIntent? getDeleteIntent();
+    method public boolean isAvailableOnTv();
+    method public boolean isSuppressShowOverApps();
+    method public androidx.core.app.NotificationCompat.TvExtender setChannelId(String?);
+    method public androidx.core.app.NotificationCompat.TvExtender setContentIntent(android.app.PendingIntent?);
+    method public androidx.core.app.NotificationCompat.TvExtender setDeleteIntent(android.app.PendingIntent?);
+    method public androidx.core.app.NotificationCompat.TvExtender setSuppressShowOverApps(boolean);
+  }
+
   public static final class NotificationCompat.WearableExtender implements androidx.core.app.NotificationCompat.Extender {
     ctor public NotificationCompat.WearableExtender();
     ctor public NotificationCompat.WearableExtender(android.app.Notification);

diff --git a/core/core/api/restricted_current.txt b/core/core/api/restricted_current.txt
index ace5cbf..05827a1 100644
--- a/core/core/api/restricted_current.txt
+++ b/core/core/api/restricted_current.txt

@@ -792,15 +792,15 @@
     field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected androidx.core.app.NotificationCompat.Builder! mBuilder;
   }
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final class NotificationCompat.TvExtender implements androidx.core.app.NotificationCompat.Extender {
+  public static final class NotificationCompat.TvExtender implements androidx.core.app.NotificationCompat.Extender {
     ctor public NotificationCompat.TvExtender();
     ctor public NotificationCompat.TvExtender(android.app.Notification);
     method public androidx.core.app.NotificationCompat.Builder extend(androidx.core.app.NotificationCompat.Builder);
     method public String? getChannelId();
     method public android.app.PendingIntent? getContentIntent();
     method public android.app.PendingIntent? getDeleteIntent();
-    method public boolean getSuppressShowOverApps();
     method public boolean isAvailableOnTv();
+    method public boolean isSuppressShowOverApps();
     method public androidx.core.app.NotificationCompat.TvExtender setChannelId(String?);
     method public androidx.core.app.NotificationCompat.TvExtender setContentIntent(android.app.PendingIntent?);
     method public androidx.core.app.NotificationCompat.TvExtender setDeleteIntent(android.app.PendingIntent?);

diff --git a/core/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java b/core/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
index eb5c03d..55fa032 100644
--- a/core/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
+++ b/core/core/src/androidTest/java/androidx/core/app/NotificationCompatTest.java

@@ -3325,9 +3325,9 @@
     public void tvExtenderSetGetSuppressShowOverApps() {
         NotificationCompat.TvExtender tvExtender = new NotificationCompat.TvExtender();
         tvExtender.setSuppressShowOverApps(true);
-        assertTrue(tvExtender.getSuppressShowOverApps());
+        assertTrue(tvExtender.isSuppressShowOverApps());
         tvExtender.setSuppressShowOverApps(false);
-        assertFalse(tvExtender.getSuppressShowOverApps());
+        assertFalse(tvExtender.isSuppressShowOverApps());
     }
 
     @Test
@@ -3394,7 +3394,7 @@
         assertEquals("My cool channel", recoveredExtender.getChannelId());
         assertEquals(contentIntent, recoveredExtender.getContentIntent());
         assertEquals(deleteIntent, recoveredExtender.getDeleteIntent());
-        assertTrue(recoveredExtender.getSuppressShowOverApps());
+        assertTrue(recoveredExtender.isSuppressShowOverApps());
         assertTrue(recoveredExtender.isAvailableOnTv());
     }
 

diff --git a/core/core/src/main/java/androidx/core/app/NotificationCompat.java b/core/core/src/main/java/androidx/core/app/NotificationCompat.java
index 745fdaf..17c5d24 100644
--- a/core/core/src/main/java/androidx/core/app/NotificationCompat.java
+++ b/core/core/src/main/java/androidx/core/app/NotificationCompat.java

@@ -8454,10 +8454,7 @@
      * <p>TV extensions can be accessed on an existing notification by using the
      * {@code TvExtender(Notification)} constructor, and then using the {@code get} methods
      * to access values.
-     *
-     * @hide
      */
-    @RestrictTo(LIBRARY_GROUP_PREFIX)
     public static final class TvExtender implements Extender {
         private static final String TAG = "TvExtender";
 
@@ -8468,17 +8465,10 @@
         /** @hide **/
         @RestrictTo(LIBRARY_GROUP_PREFIX)
         private static final String EXTRA_FLAGS = "flags";
-        /** @hide **/
-        @RestrictTo(LIBRARY_GROUP_PREFIX)
+
         static final String EXTRA_CONTENT_INTENT = "content_intent";
-        /** @hide **/
-        @RestrictTo(LIBRARY_GROUP_PREFIX)
         static final String EXTRA_DELETE_INTENT = "delete_intent";
-        /** @hide **/
-        @RestrictTo(LIBRARY_GROUP_PREFIX)
         static final String EXTRA_CHANNEL_ID = "channel_id";
-        /** @hide **/
-        @RestrictTo(LIBRARY_GROUP_PREFIX)
         static final String EXTRA_SUPPRESS_SHOW_OVER_APPS = "suppressShowOverApps";
 
         // Flags bitwise-ored to mFlags
@@ -8636,7 +8626,7 @@
          * Returns true if this notification should not show messages over top of apps
          * outside of the launcher.
          */
-        public boolean getSuppressShowOverApps() {
+        public boolean isSuppressShowOverApps() {
             return mSuppressShowOverApps;
         }
     }