1 files changed, 9 insertions, 3 deletions
diff --git a/java/com/android/newbubble/NewCheckableButton.java b/java/com/android/newbubble/NewCheckableButton.java
index 15858d39e..fda0ddc6e 100644
--- a/java/com/android/newbubble/NewCheckableButton.java
+++ b/java/com/android/newbubble/NewCheckableButton.java
@@ -45,22 +45,28 @@ public class NewCheckableButton extends AppCompatButton implements Checkable {
 
   public NewCheckableButton(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
+  }
 
+  public void setCheckable(boolean checkable) {
     ViewCompat.setAccessibilityDelegate(
         this,
         new AccessibilityDelegateCompat() {
           @Override
           public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {
             super.onInitializeAccessibilityEvent(host, event);
-            event.setChecked(isChecked());
+            if (checkable) {
+              event.setChecked(isChecked());
+            }
           }
 
           @Override
           public void onInitializeAccessibilityNodeInfo(
               View host, AccessibilityNodeInfoCompat info) {
             super.onInitializeAccessibilityNodeInfo(host, info);
-            info.setCheckable(true);
-            info.setChecked(isChecked());
+            info.setCheckable(checkable);
+            if (checkable) {
+              info.setChecked(isChecked());
+            }
           }
         });
   }