[Android] Create Settings modular target

Create separate Settings module, and build SettingsUtils.java in this
new target.

Bug: 1035928
Change-Id: I906b860d7486569305757acac0a56ec4a545d5e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1976153Reviewed-by: Sky Malice <skym@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726503}

chrome/android/BUILD.gn

@@ -256,6 +256,7 @@ android_library("chrome_java") {
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/notifications/chime/android:java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/settings:java",
     "//chrome/browser/share/android:java_resources",
     "//chrome/browser/ui/android/appmenu:factory_java",
     "//chrome/browser/ui/android/appmenu:java",

chrome/android/chrome_java_sources.gni

@@ -1365,7 +1365,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/SeekBarPreference.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsLauncher.java",
-  "java/src/org/chromium/chrome/browser/settings/SettingsUtils.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",

chrome/browser/settings/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+android_library("java") {
+  sources = [
+    "android/java/src/org/chromium/chrome/browser/settings/SettingsUtils.java",
+  ]
+  deps = [
+    "//base:base_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:com_android_support_design_java",
+    "//third_party/android_deps:com_android_support_preference_v7_java",
+    "//ui/android:ui_java",
+  ]
+}

chrome/browser/settings/OWNERS

+file://chrome/android/java/src/org/chromium/chrome/browser/settings/OWNERS
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsUtils.java → chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/SettingsUtils.java

@@ -22,8 +22,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
 
 import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.chrome.R;
-
+import org.chromium.ui.R;
 /**
  * A helper class for Settings.
  */
@@ -86,7 +85,8 @@ public class SettingsUtils {
      */
     public static boolean setOverflowMenuVisibility(@Nullable Activity activity, int visibility) {
         if (activity == null) return false;
-        ViewGroup actionBar = activity.findViewById(org.chromium.chrome.R.id.action_bar);
+        // TODO(chouinard): Remove R qualification once this package has its own android_resources.
+        ViewGroup actionBar = activity.findViewById(android.support.design.R.id.action_bar);
         int i = actionBar.getChildCount();
         ActionMenuView menuView = null;
         while (i-- > 0) {