Extract more preference widgets to Settings module

Extract the following preferences to Settings build target, along with
owned resources:
- ButtonPreference.java
- ChromeBaseCheckBoxPreference.java
- ChromeSwitchPreference.java
- TextMessagePreference.java

Bug: 1035928
Change-Id: I1aa8e616bbb1b98bc4217ef2669d5388dab40cf4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1991732
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729568}

chrome/android/chrome_java_sources.gni

@@ -1364,9 +1364,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
   "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
   "java/src/org/chromium/chrome/browser/sessions/SessionTabHelper.java",
-  "java/src/org/chromium/chrome/browser/settings/ButtonPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/ChromeBaseCheckBoxPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java",
   "java/src/org/chromium/chrome/browser/settings/ExpandablePreferenceGroup.java",
   "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java",
   "java/src/org/chromium/chrome/browser/settings/LearnMorePreference.java",
@@ -1378,7 +1375,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/SettingsLauncher.java",
   "java/src/org/chromium/chrome/browser/settings/SpinnerPreference.java",
   "java/src/org/chromium/chrome/browser/settings/TextAndButtonPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/TextMessagePreference.java",
   "java/src/org/chromium/chrome/browser/settings/about/AboutChromePreferenceOSVersion.java",
   "java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java",
   "java/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridge.java",

chrome/android/java/res/values-v21/styles.xml

@@ -32,16 +32,6 @@
         <item name="android:paddingEnd">0dp</item>
     </style>
 
-    <style name="PreferenceLayoutBase">
-        <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
-        <item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:paddingBottom">16dp</item>
-        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
-        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
-    </style>
-    <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
-
     <!-- Web Notifications -->
     <style name="WebNotificationTitle"
         parent="@android:style/TextAppearance.Material.Notification.Title"/>

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

@@ -243,15 +243,6 @@
         <item name="android:paddingStart">@dimen/pref_autofill_content_spacing</item>
         <item name="android:paddingEnd">@dimen/pref_autofill_content_spacing</item>
     </style>
-    <style name="PreferenceLayoutBase">
-        <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
-        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
-        <item name="android:paddingTop">6dp</item>
-        <item name="android:paddingBottom">6dp</item>
-        <item name="android:paddingStart">8dp</item>
-        <item name="android:paddingEnd">8dp</item>
-    </style>
-    <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
     <style name="PreferenceSpinnerItem">
         <item name="android:textAppearance">@style/TextAppearance.PreferenceMediumText</item>
     </style>

chrome/browser/settings/BUILD.gn

@@ -10,8 +10,12 @@ android_library("java") {
     "android/java/src/org/chromium/chrome/browser/settings/ManagedPreferencesUtils.java",
     "android/java/src/org/chromium/chrome/browser/settings/SearchUtils.java",
     "android/java/src/org/chromium/chrome/browser/settings/SettingsUtils.java",
+    "android/widget/java/src/org/chromium/chrome/browser/settings/ButtonPreference.java",
+    "android/widget/java/src/org/chromium/chrome/browser/settings/ChromeBaseCheckBoxPreference.java",
     "android/widget/java/src/org/chromium/chrome/browser/settings/ChromeBasePreference.java",
     "android/widget/java/src/org/chromium/chrome/browser/settings/ChromeImageViewPreference.java",
+    "android/widget/java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java",
+    "android/widget/java/src/org/chromium/chrome/browser/settings/TextMessagePreference.java",
   ]
   deps = [
     ":java_resources",

chrome/browser/settings/android/java/res/values-v21/styles.xml

@@ -28,4 +28,15 @@
     <style name="PreferenceSummary">
         <item name="android:textAppearance">@style/TextAppearance.BlackBody</item>
     </style>
+
+    <style name="PreferenceLayoutBase">
+        <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
+        <item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>
+        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingBottom">16dp</item>
+        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
+        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
+    </style>
+
+    <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
 </resources>

chrome/browser/settings/android/java/res/values/styles.xml

@@ -38,4 +38,15 @@
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
+
+    <style name="PreferenceLayoutBase">
+        <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
+        <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+    </style>
+
+    <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
 </resources>

chrome/android/java/src/org/chromium/chrome/browser/settings/ButtonPreference.java → chrome/browser/settings/android/widget/java/src/org/chromium/chrome/browser/settings/ButtonPreference.java

@@ -10,8 +10,6 @@ import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.widget.Button;
 
-import org.chromium.chrome.R;
-
 /**
  * A {@link Preference} that provides button functionality.
  *