From 893b7d629d5812f4901b1071cdb2fa2fcecd9fc4 Mon Sep 17 00:00:00 2001
From: yingleiw <yingleiw@google.com>
Date: Wed, 30 Sep 2020 16:58:37 -0700
Subject: Change radio button's default state description to "selected", "not
 selected"

Per partner request.

Fix: 171507541
Test: tested manually with talkback.

Change-Id: I234281fed476e664cd13bf3079fc706564ad1f3d
---
 core/java/android/widget/RadioButton.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'core/java/android/widget/RadioButton.java')

diff --git a/core/java/android/widget/RadioButton.java b/core/java/android/widget/RadioButton.java
index 3e26f6369747..a04d7c34c444 100644
--- a/core/java/android/widget/RadioButton.java
+++ b/core/java/android/widget/RadioButton.java
@@ -16,10 +16,13 @@
 
 package android.widget;
 
+import android.annotation.NonNull;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.accessibility.AccessibilityNodeInfo;
 
+import com.android.internal.R;
+
 
 /**
  * <p>
@@ -98,4 +101,15 @@ public class RadioButton extends CompoundButton {
             }
         }
     }
+
+    /** @hide **/
+    @Override
+    @NonNull
+    protected CharSequence getButtonStateDescription() {
+        if (isChecked()) {
+            return getResources().getString(R.string.selected);
+        } else {
+            return getResources().getString(R.string.not_selected);
+        }
+    }
 }
-- 
cgit v1.2.3


From c42edd69f93606470e13a5b508087c5ce8476359 Mon Sep 17 00:00:00 2001
From: Steven Kideckel <kideckel@google.com>
Date: Wed, 3 Feb 2021 13:43:26 +0000
Subject: Enable use of of CompoundButtons in RemoteViews

This change adds @RemoteView and @RemotableViewMethod to the relevant
views we'd like to enable. New APIs have been added to set Icons in
CompooundButton and Switch.

onCheckedChange support will be added in a follow-up CL.

CompoundButton.setChecked and RadioGroup.check aren't directly remotable
since RemoteViews will need to control those calls directly to ensure
that any onCheckedChange listeners aren't triggered by RemoteViews
actions.

Bug: 179245670
Test: manual, atest
Change-Id: I85e2aee62cf39ed008d9c9c1fece813293841fbd
---
 core/java/android/widget/RadioButton.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/java/android/widget/RadioButton.java')

diff --git a/core/java/android/widget/RadioButton.java b/core/java/android/widget/RadioButton.java
index a04d7c34c444..9b3503433e56 100644
--- a/core/java/android/widget/RadioButton.java
+++ b/core/java/android/widget/RadioButton.java
@@ -20,6 +20,7 @@ import android.annotation.NonNull;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.accessibility.AccessibilityNodeInfo;
+import android.widget.RemoteViews.RemoteView;
 
 import com.android.internal.R;
 
@@ -49,6 +50,7 @@ import com.android.internal.R;
  * {@link android.R.styleable#View View Attributes}
  * </p>
  */
+@RemoteView
 public class RadioButton extends CompoundButton {
 
     public RadioButton(Context context) {
-- 
cgit v1.2.3