Polish the Themes setting

This CL updates the padding of RadioButtonWithDescription and the
color of the radio button control. It also fixes a string.

Bug: 942771
Change-Id: I4cd20543e1121235a2fd99cf745d58fc2bf9d9f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1553313Reviewed-by: Becky Zhou <huayinz@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Sinan Sahin <sinansahin@google.com>
Cr-Commit-Position: refs/heads/master@{#649175}

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

@@ -31,6 +31,5 @@
         android:layout_alignStart="@id/title"
         android:layout_below="@id/title"
         android:textAppearance="@style/TextAppearance.BlackHint2"
-        android:paddingTop="4dp"
         android:visibility="gone" />
 </merge>

chrome/android/java/res/values/dimens.xml

@@ -605,6 +605,7 @@
     <dimen name="swipe_to_dismiss_threshold">72dp</dimen>
 
     <!-- RadioButtonWithDescription dimensions -->
-    <dimen name="radio_button_with_description_padding">12dp</dimen>
+    <dimen name="radio_button_with_description_lateral_padding">16dp</dimen>
+    <dimen name="radio_button_with_description_vertical_padding">10dp</dimen>
 
 </resources>

chrome/android/java/res_night/values-night/colors.xml

@@ -5,7 +5,7 @@
 
 <resources>
     <color name="light_active_color">@color/modern_blue_300</color>
-    <color name="control_normal_color">@color/modern_grey_200</color>
+    <color name="control_normal_color">@color/modern_grey_500</color>
 
     <color name="toolbar_text_box_background">@color/modern_grey_800</color>
 

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

@@ -54,9 +54,13 @@ public class RadioButtonWithDescription extends RelativeLayout implements OnClic
 
         if (attrs != null) applyAttributes(attrs);
 
-        final int padding =
-                getResources().getDimensionPixelSize(R.dimen.radio_button_with_description_padding);
-        setPaddingRelative(padding, padding, padding, padding);
+        setMinimumHeight(getResources().getDimensionPixelSize(R.dimen.min_touch_target_size));
+
+        final int lateralPadding = getResources().getDimensionPixelSize(
+                R.dimen.radio_button_with_description_lateral_padding);
+        final int verticalPadding = getResources().getDimensionPixelSize(
+                R.dimen.radio_button_with_description_vertical_padding);
+        setPaddingRelative(lateralPadding, verticalPadding, lateralPadding, verticalPadding);
 
         // We want RadioButtonWithDescription to handle the clicks itself.
         setOnClickListener(this);

chrome/android/java/strings/android_chrome_strings.grd

@@ -705,7 +705,7 @@ CHAR-LIMIT guidelines:
         System default
       </message>
       <message name="IDS_THEMES_SYSTEM_DEFAULT_SUMMARY" desc="Summary for the System Default option.">
-        Turn on dark theme when your device's Power Saver is on
+        Turn on dark theme when your device's Battery Saver is on
       </message>
 
       <!-- Privacy preferences -->

chrome/android/java/strings/android_chrome_strings_grd/IDS_PREFS_THEMES.png.sha1

-83e6b33441fb9fb040453b65e62b1ec2806b5dc0
\ No newline at end of file
+4b29c5541aa913738c53a46c8bff615c56b35548
\ No newline at end of file

chrome/android/java/strings/android_chrome_strings_grd/IDS_THEMES_SYSTEM_DEFAULT_SUMMARY.png.sha1

-f480a380262e59945a8f6e231402e7811992452c
\ No newline at end of file
+ae1cfcb91300aac48797b74eead8b426a124aa14
\ No newline at end of file

chrome/android/java/strings/android_chrome_strings_grd/IDS_THEMES_SYSTEM_DEFAULT_TITLE.png.sha1

-9050bd8f51737af32a7b110df31e7528028253b2
\ No newline at end of file
+97131ff8855cb8e38dc9de883eecd40903526c9a
\ No newline at end of file