Add Bluetooth keyboard support to Protected media content site setting

Problem: The Protected media content Site Setting does not support
Bluetooth keyboard navigation. The three radio buttons are treated as
one clickable target, making the individual radio buttons unselectable.

Solution: Make radio buttons selectable and clickable to support
navigation with a Bluetooth keyboard.
This behavior matches existsing Chrome settings support for Bluetooth
keyboard navigation.
This change does not affect navigate by touch and will work the same as
before.

R=twellington@chromium.org

Bug: 936143
Change-Id: Ib14c4515d5a70fa0cb8344727b367e2c9260c36c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1490016Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Commit-Queue: Simon La Macchia <smacchia@amazon.com>
Cr-Commit-Position: refs/heads/master@{#638400}

chrome/android/java/res/layout/confirm_import_sync_data.xml

@@ -29,6 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
+            android:background="?android:attr/selectableItemBackground"
             app:titleText="@string/sync_import_existing_data" />
 
         <org.chromium.chrome.browser.widget.RadioButtonWithDescription
@@ -36,6 +37,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
+            android:background="?android:attr/selectableItemBackground"
             app:titleText="@string/sync_keep_existing_data_separate" />
 
     </LinearLayout>

chrome/android/java/res/layout/radio_button_with_description.xml

@@ -12,6 +12,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
+        android:clickable="false"
+        android:focusable="false"
+        android:background="@null"
         android:paddingEnd="16dp" />
 
     <TextView

chrome/android/java/res/layout/tri_state_site_settings_preference.xml

@@ -8,9 +8,9 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/PreferenceLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:focusable="false"
     android:orientation="vertical">
 
     <org.chromium.chrome.browser.widget.RadioButtonWithDescription
@@ -18,6 +18,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:background="?android:attr/selectableItemBackground"
         app:titleText="@string/website_settings_category_allowed" />
 
     <org.chromium.chrome.browser.widget.RadioButtonWithDescription
@@ -25,11 +27,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:background="?android:attr/selectableItemBackground"
         app:titleText="@string/website_settings_category_ask" />
 
     <org.chromium.chrome.browser.widget.RadioButtonWithDescription
         android:id="@+id/blocked"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:background="?android:attr/selectableItemBackground"
         app:titleText="@string/website_settings_category_blocked" />
 </LinearLayout>

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/TriStateSiteSettingsPreference.java

@@ -29,6 +29,11 @@ public class TriStateSiteSettingsPreference
 
     public TriStateSiteSettingsPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        // Make unselectable, otherwise TriStateSiteSettingsPreference is treated as one
+        // selectable Preference, instead of three selectable radio buttons.
+        // Allows radio buttons to be selected via Bluetooth keyboard (key events).
+        // See: crbug.com/936143
+        setSelectable(false);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.java

@@ -55,8 +55,10 @@ public class RadioButtonWithDescription extends RelativeLayout implements OnClic
         if (attrs != null) applyAttributes(attrs);
 
         // We want RadioButtonWithDescription to handle the clicks itself.
-        mRadioButton.setClickable(false);
         setOnClickListener(this);
+        // Make it focusable for navigation via key events (tab/up/down keys)
+        // with Bluetooth keyboard. See: crbug.com/936143
+        setFocusable(true);
     }
 
     private void applyAttributes(AttributeSet attrs) {
@@ -111,6 +113,10 @@ public class RadioButtonWithDescription extends RelativeLayout implements OnClic
      */
     public void setChecked(boolean checked) {
         mRadioButton.setChecked(checked);
+        // Retain focus on RadioButtonWithDescription after radio button is checked.
+        // Otherwise focus is lost. This is required for Bluetooth keyboard navigation.
+        // See: crbug.com/936143
+        if (checked) requestFocus();
     }
 
     public void setOnCheckedChangeListener(OnCheckedChangeListener listener) {