Add selectable background into RadioButtonWithDescription

Seems every RadioButtonWithDescription has the xml attribute of
android:background="?attr/selectalbeItemBackground". Adding this
attributed into widget constructor for simplicity.

Bug: 1048863
Change-Id: Ia335afe12cd5130bdddccf0e083db1b35e28a572
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067279
Commit-Queue: Theresa  <twellington@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747090}

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

@@ -28,14 +28,12 @@
             android:id="@+id/sync_confirm_import_choice"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
             app:primaryText="@string/sync_import_existing_data" />
 
         <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
             android:id="@+id/sync_keep_separate_choice"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
             app:primaryText="@string/sync_keep_existing_data_separate" />
 
     </LinearLayout>

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

@@ -33,14 +33,12 @@
         android:id="@+id/radio_button_chrome_ntp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
         app:primaryText="@string/options_homepage_chrome_homepage" />
 
     <org.chromium.components.browser_ui.widget.RadioButtonWithEditText
         android:id="@+id/radio_button_uri_edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
         android:hint="@string/options_homepage_edit_hint"
         android:inputType="textUri" />
 

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

@@ -19,7 +19,6 @@
           android:id="@+id/system_default"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:background="?attr/selectableItemBackground"
           app:primaryText="@string/themes_system_default_title"
           app:descriptionText="@string/themes_system_default_summary" />
 
@@ -31,7 +30,6 @@
           android:minHeight="@dimen/min_touch_target_size"
           android:paddingTop="8dp"
           android:paddingBottom="8dp"
-          android:background="?attr/selectableItemBackground"
           app:primaryText="@string/light_mode" />
 
       <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
@@ -41,7 +39,6 @@
           android:minHeight="@dimen/min_touch_target_size"
           android:paddingTop="8dp"
           android:paddingBottom="8dp"
-          android:background="?attr/selectableItemBackground"
           app:primaryText="@string/dark_mode" />
 
     </org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout>

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

@@ -24,7 +24,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:background="?android:attr/selectableItemBackground"
             app:primaryText="@string/website_settings_category_allowed" />
 
         <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
@@ -32,7 +31,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:background="?android:attr/selectableItemBackground"
             app:primaryText="@string/website_settings_category_ask" />
 
         <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
@@ -40,7 +38,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:background="?android:attr/selectableItemBackground"
             app:primaryText="@string/website_settings_category_blocked" />
 
     </org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout>

chrome/test/data/android/render_tests/RadioButtonRenderTest.NightModeDisabled-test_radio_description_3.Nexus_5-19.png.sha1

+0f35fa3236e2f0a97bb20e0ec44316f4defb1650
\ No newline at end of file

chrome/test/data/android/render_tests/RadioButtonRenderTest.NightModeDisabled-test_radio_description_3.Nexus_5X-23.png.sha1

+cf4824710099cfd170481b87d7ba6b6ba6421a77
\ No newline at end of file

chrome/test/data/android/render_tests/RadioButtonRenderTest.NightModeEnabled-test_radio_description_3.Nexus_5-19.png.sha1

+80c46b8ed5b5dc2d56d8f6f8bc8f3b395744ab5a
\ No newline at end of file

chrome/test/data/android/render_tests/RadioButtonRenderTest.NightModeEnabled-test_radio_description_3.Nexus_5X-23.png.sha1

+f119191f7a806fbd27fbf6bb16e59df7a6425bc0
\ No newline at end of file

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonRenderTest.java

@@ -48,6 +48,7 @@ public class RadioButtonRenderTest extends DummyUiActivityTestCase {
 
     private RadioButtonWithDescription mRadioButtonWithDescription1;
     private RadioButtonWithDescription mRadioButtonWithDescription2;
+    private RadioButtonWithDescription mRadioButtonWithDescription3;
 
     private RadioButtonWithEditText mRadioButtonWithEditText1;
     private RadioButtonWithEditText mRadioButtonWithEditText2;
@@ -76,6 +77,7 @@ public class RadioButtonRenderTest extends DummyUiActivityTestCase {
 
             mRadioButtonWithDescription1 = content.findViewById(R.id.test_radio_description_1);
             mRadioButtonWithDescription2 = content.findViewById(R.id.test_radio_description_2);
+            mRadioButtonWithDescription3 = content.findViewById(R.id.test_radio_description_3);
             mRadioButtonWithEditText1 = content.findViewById(R.id.test_radio_edit_text_1);
             mRadioButtonWithEditText2 = content.findViewById(R.id.test_radio_edit_text_2);
             mRadioButtonWithEditText3 = content.findViewById(R.id.test_radio_edit_text_3);
@@ -85,6 +87,7 @@ public class RadioButtonRenderTest extends DummyUiActivityTestCase {
         Assert.assertNotNull(mLayout);
         Assert.assertNotNull(mRadioButtonWithDescription1);
         Assert.assertNotNull(mRadioButtonWithDescription2);
+        Assert.assertNotNull(mRadioButtonWithDescription3);
         Assert.assertNotNull(mRadioButtonWithEditText1);
         Assert.assertNotNull(mRadioButtonWithEditText2);
         Assert.assertNotNull(mRadioButtonWithEditText3);
@@ -97,6 +100,7 @@ public class RadioButtonRenderTest extends DummyUiActivityTestCase {
     public void testRadioButtonWithDescriptionLayout() throws Exception {
         mRenderTestRule.render(mRadioButtonWithDescription1, "test_radio_description_1");
         mRenderTestRule.render(mRadioButtonWithDescription2, "test_radio_description_2");
+        mRenderTestRule.render(mRadioButtonWithDescription3, "test_radio_description_3");
         mRenderTestRule.render(mRadioButtonWithEditText1, "test_radio_edit_text_1");
         mRenderTestRule.render(mRadioButtonWithEditText2, "test_radio_edit_text_2");
         mRenderTestRule.render(mRadioButtonWithEditText3, "test_radio_edit_text_3");

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/RadioButtonWithDescription.java

@@ -11,6 +11,7 @@ import android.os.Parcelable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.SparseArray;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -88,6 +89,14 @@ public class RadioButtonWithDescription extends RelativeLayout implements OnClic
                 getPaddingEnd() == 0 ? lateralPadding : getPaddingEnd(),
                 getPaddingBottom() == 0 ? verticalPadding : getPaddingBottom());
 
+        // Set the background if not specified in xml
+        if (getBackground() == null) {
+            TypedValue background = new TypedValue();
+            getContext().getTheme().resolveAttribute(
+                    android.R.attr.selectableItemBackground, background, true);
+            setBackgroundResource(background.resourceId);
+        }
+
         // We want RadioButtonWithDescription to handle the clicks itself.
         setOnClickListener(this);
         // Make it focusable for navigation via key events (tab/up/down keys)

components/browser_ui/widget/android/test/java/res/layout/radio_button_render_test.xml

@@ -18,7 +18,6 @@
               android:id="@+id/test_radio_description_1"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="?attr/selectableItemBackground"
               app:primaryText="@string/test_string" />
 
         <!-- RadioButtonWithDescription - With primary and description. -->
@@ -26,7 +25,15 @@
             android:id="@+id/test_radio_description_2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
+            app:primaryText="@string/test_string"
+            app:descriptionText="@string/test_string" />
+
+        <!-- RadioButtonWithDescription - With background override. -->
+        <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
+            android:id="@+id/test_radio_description_3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/background_color_non_empty"
             app:primaryText="@string/test_string"
             app:descriptionText="@string/test_string" />
 
@@ -40,7 +47,6 @@
             android:paddingBottom="8dp"
             android:inputType="text"
             android:hint="@string/test_uri"
-            android:background="?attr/selectableItemBackground"
             app:primaryText="@string/test_string"
             app:descriptionText="@string/test_string" />
 
@@ -54,7 +60,6 @@
             android:paddingBottom="8dp"
             android:inputType="text"
             android:hint="@string/test_uri"
-            android:background="?attr/selectableItemBackground"
             app:primaryText="@string/test_string" />
 
         <!-- RadioButtonWithDescription - Without primary, with hint, with description. -->
@@ -67,7 +72,6 @@
             android:paddingBottom="8dp"
             android:inputType="text"
             android:hint="@string/test_uri"
-            android:background="?attr/selectableItemBackground"
             app:descriptionText="@string/test_string" />
 
         <!-- RadioButtonWithDescription - Without primary, without description. -->
@@ -79,7 +83,6 @@
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:inputType="text"
-            android:hint="@string/test_uri"
-            android:background="?attr/selectableItemBackground" />
+            android:hint="@string/test_uri" />
     </org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout>
 </FrameLayout>