From c0c4b3a1115725eeb4b989baab7062962581091c Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 30 May 2019 10:31:40 -0400
Subject: [PATCH] Fix a11y readout of notification importance buttons

Test: manual with TB
Bug: 134047401
Change-Id: Idab3426a37ed3f25c2cde47e0747ac9a31850f62
---
 res/layout/notif_importance_preference.xml         |  4 +--
 .../notification/ImportancePreference.java         |  2 ++
 .../NotificationButtonRelativeLayout.java          | 33 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 src/com/android/settings/notification/NotificationButtonRelativeLayout.java

diff --git a/res/layout/notif_importance_preference.xml b/res/layout/notif_importance_preference.xml
index 2fc2740a82..395e04908e 100644
--- a/res/layout/notif_importance_preference.xml
+++ b/res/layout/notif_importance_preference.xml
@@ -24,7 +24,7 @@
     android:padding="@dimen/notification_importance_toggle_marginTop"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <com.android.settings.notification.NotificationButtonRelativeLayout
         android:id="@+id/alert"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             android:layout_below="@id/alert_icon"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
-    </RelativeLayout>
+    </com.android.settings.notification.NotificationButtonRelativeLayout>
 
     <RelativeLayout
         android:id="@+id/silence"
diff --git a/src/com/android/settings/notification/ImportancePreference.java b/src/com/android/settings/notification/ImportancePreference.java
index 0d39c8f0fe..3e81d0cd06 100644
--- a/src/com/android/settings/notification/ImportancePreference.java
+++ b/src/com/android/settings/notification/ImportancePreference.java
@@ -117,11 +117,13 @@ public class ImportancePreference extends Preference {
             case IMPORTANCE_LOW:
                 mAlertButton.setBackground(unselectedBackground);
                 mSilenceButton.setBackground(selectedBackground);
+                mSilenceButton.setSelected(true);
                 break;
             case IMPORTANCE_HIGH:
             default:
                 mSilenceButton.setBackground(unselectedBackground);
                 mAlertButton.setBackground(selectedBackground);
+                mAlertButton.setSelected(true);
                 break;
         }
         setImportanceSummary((ViewGroup) holder.itemView, mImportance, false);
diff --git a/src/com/android/settings/notification/NotificationButtonRelativeLayout.java b/src/com/android/settings/notification/NotificationButtonRelativeLayout.java
new file mode 100644
index 0000000000..358cbf35ba
--- /dev/null
+++ b/src/com/android/settings/notification/NotificationButtonRelativeLayout.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.notification;
+
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.Button;
+import android.widget.RelativeLayout;
+
+public class NotificationButtonRelativeLayout extends RelativeLayout {
+
+    public NotificationButtonRelativeLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public CharSequence getAccessibilityClassName() {
+        return Button.class.getName();
+    }
+}
\ No newline at end of file
-- 
2.11.0