Android: Split out autofill_assistant

- This is the first step in converting autofill_assistant to a DFM.
- Create a new //chrome/android/features/autofill_assistant:java target
  that includes almost all files that used to be under
  org.chromium.chrome.browser.autofill_assistant.*.
  - Create separate strings and resources targets.
  - Split out instrumentation test code.
  - Add the resulting target to chrome_all_java.
  - Due to a dependency from CustomTabs, this move excludes:
    - AutofillAssistantClient.java
    - AutofillAssistantFacade.java
    - AutofillAssistantMetrics.java
    - AutofillAssistantPreferencesUtil.java

Tbr: Just moving existing DEPS into a new DEPS file
Bug: 846440,922053
Change-Id: I0ee13a75f5f0ce59496e924bcc8e54ef6e960957
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1499720Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Ganggui Tang <gogerald@chromium.org>
Commit-Queue: Theresa <twellington@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638357}

build/android/lint/suppressions.xml

@@ -118,7 +118,7 @@ Still reading?
     <ignore regexp="ui/android/java/res/drawable-xxhdpi"/>
     <ignore regexp="ui/android/java/res/drawable-xxxhdpi"/>
     <!-- This is intentional to reduce APK size. See: http://crrev/c/1352161 -->
-    <ignore regexp="chrome/android/java/res_autofill_assistant/drawable-*"/>
+    <ignore regexp="chrome/android/features/autofill_assistant/java/res/drawable-*"/>
   </issue>
   <issue id="IconDipSize">
     <ignore regexp="chromecast/internal"/>

chrome/android/BUILD.gn

@@ -144,14 +144,6 @@ android_resources("chrome_download_java_resources") {
   custom_package = "org.chromium.chrome.download"
 }
 
-android_resources("chrome_autofill_assistant_java_resources") {
-  resource_dirs = [ "//chrome/android/java/res_autofill_assistant" ]
-  deps = [
-    ":chrome_app_java_resources",
-  ]
-  custom_package = "org.chromium.chrome.autofill_assistant"
-}
-
 java_strings_grd("chrome_strings_grd") {
   defines = chrome_grit_defines
   grd_file = "java/strings/android_chrome_strings.grd"
@@ -240,7 +232,6 @@ java_cpp_template("vr_build_config") {
 android_library("chrome_java") {
   deps = [
     ":chrome_app_java_resources",
-    ":chrome_autofill_assistant_java_resources",
     ":chrome_download_java_resources",
     ":chrome_public_android_manifest",
     ":chrome_public_apk_template_resources",
@@ -442,6 +433,7 @@ android_library("chrome_java") {
 java_group("chrome_all_java") {
   deps = [
     ":chrome_java",
+    "//chrome/android/features/autofill_assistant:java",
     "//chrome/android/features/media_router:java",
   ]
 
@@ -1820,6 +1812,7 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
   deps = [
     ":chrome_test_apk_template_resources",
     ":chrome_test_java",
+    "//chrome/android/features/autofill_assistant:test_java",
     "//chrome/android/features/media_router:test_java",
     "//chrome/android/features/touchless:touchless_java_test",
     "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
@@ -2089,6 +2082,16 @@ monochrome_public_bundle_tmpl("trichrome_chrome_bundle") {
 
 generate_jni("jni_headers") {
   sources = [
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsModel.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestDelegate.java",
+    "features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestModel.java",
     "features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java",
     "features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java",
     "features/media_router/java/src/org/chromium/chrome/browser/media/router/FlingingControllerBridge.java",
@@ -2126,17 +2129,7 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
     "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
     "java/src/org/chromium/chrome/browser/autofill/keyboard_accessory/ManualFillingBridge.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestModel.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
     "java/src/org/chromium/chrome/browser/banners/AppBannerManager.java",

chrome/android/features/autofill_assistant/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/config.gni")
+import("//build/config/android/rules.gni")
+import("//chrome/common/features.gni")
+
+android_library("java") {
+  deps = [
+    ":java_resources",
+    "//base:base_java",
+    "//chrome/android:chrome_java",
+    "//components/url_formatter/android:url_formatter_java",
+    "//content/public/android:content_java",
+    "//third_party/android_deps:android_support_design_java",
+    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
+    "//third_party/android_deps:com_android_support_support_compat_java",
+    "//third_party/android_deps:com_android_support_support_core_ui_java",
+    "//third_party/android_deps:com_android_support_support_core_utils_java",
+    "//third_party/blink/public/mojom:android_mojo_bindings_java",
+    "//ui/android:ui_java",
+  ]
+  java_files = [
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantKeyboardCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantSnackbar.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/EditDistance.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/FeedbackContext.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantCarouselCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantCarouselModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChip.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantChipViewHolder.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsViewBinder.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AnimatedProgressBar.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderViewBinder.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/TouchEventFilterView.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestOptions.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AutofillAssistantPaymentRequest.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AutofillAssistantPaymentRequestSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/PaymentRequestBottomBar.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/PaymentRequestUI.java",
+  ]
+}
+
+android_library("test_java") {
+  testonly = true
+
+  java_files = [
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/EditDistanceTest.java",
+  ]
+
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/android:chrome_java",
+    "//chrome/android:chrome_test_util_java",
+    "//net/android:net_java_test_support",
+    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+    "//ui/android:ui_full_java",
+  ]
+}
+
+android_resources("java_resources") {
+  resource_dirs = [ "java/res" ]
+  deps = [
+    ":java_strings_grd",
+    "//chrome/android:chrome_app_java_resources",
+  ]
+  custom_package = "org.chromium.chrome.autofill_assistant"
+}
+
+java_strings_grd("java_strings_grd") {
+  defines = chrome_grit_defines
+  grd_file = "java/strings/android_chrome_autofill_assistant_strings.grd"
+  outputs = [
+    "values-am/android_chrome_autofill_assistant_strings.xml",
+    "values-ar/android_chrome_autofill_assistant_strings.xml",
+    "values-bg/android_chrome_autofill_assistant_strings.xml",
+    "values-ca/android_chrome_autofill_assistant_strings.xml",
+    "values-cs/android_chrome_autofill_assistant_strings.xml",
+    "values-da/android_chrome_autofill_assistant_strings.xml",
+    "values-de/android_chrome_autofill_assistant_strings.xml",
+    "values-el/android_chrome_autofill_assistant_strings.xml",
+    "values/android_chrome_autofill_assistant_strings.xml",
+    "values-en-rGB/android_chrome_autofill_assistant_strings.xml",
+    "values-es/android_chrome_autofill_assistant_strings.xml",
+    "values-es-rUS/android_chrome_autofill_assistant_strings.xml",
+    "values-fa/android_chrome_autofill_assistant_strings.xml",
+    "values-fi/android_chrome_autofill_assistant_strings.xml",
+    "values-tl/android_chrome_autofill_assistant_strings.xml",
+    "values-fr/android_chrome_autofill_assistant_strings.xml",
+    "values-hi/android_chrome_autofill_assistant_strings.xml",
+    "values-hr/android_chrome_autofill_assistant_strings.xml",
+    "values-hu/android_chrome_autofill_assistant_strings.xml",
+    "values-in/android_chrome_autofill_assistant_strings.xml",
+    "values-it/android_chrome_autofill_assistant_strings.xml",
+    "values-iw/android_chrome_autofill_assistant_strings.xml",
+    "values-ja/android_chrome_autofill_assistant_strings.xml",
+    "values-ko/android_chrome_autofill_assistant_strings.xml",
+    "values-lt/android_chrome_autofill_assistant_strings.xml",
+    "values-lv/android_chrome_autofill_assistant_strings.xml",
+    "values-nl/android_chrome_autofill_assistant_strings.xml",
+    "values-nb/android_chrome_autofill_assistant_strings.xml",
+    "values-pl/android_chrome_autofill_assistant_strings.xml",
+    "values-pt-rBR/android_chrome_autofill_assistant_strings.xml",
+    "values-pt-rPT/android_chrome_autofill_assistant_strings.xml",
+    "values-ro/android_chrome_autofill_assistant_strings.xml",
+    "values-ru/android_chrome_autofill_assistant_strings.xml",
+    "values-sk/android_chrome_autofill_assistant_strings.xml",
+    "values-sl/android_chrome_autofill_assistant_strings.xml",
+    "values-sr/android_chrome_autofill_assistant_strings.xml",
+    "values-sv/android_chrome_autofill_assistant_strings.xml",
+    "values-sw/android_chrome_autofill_assistant_strings.xml",
+    "values-th/android_chrome_autofill_assistant_strings.xml",
+    "values-tr/android_chrome_autofill_assistant_strings.xml",
+    "values-uk/android_chrome_autofill_assistant_strings.xml",
+    "values-vi/android_chrome_autofill_assistant_strings.xml",
+    "values-zh-rCN/android_chrome_autofill_assistant_strings.xml",
+    "values-zh-rTW/android_chrome_autofill_assistant_strings.xml",
+  ]
+}

chrome/android/features/autofill_assistant/java/DEPS

+include_rules = [
+  "+content/public/android/java/src/org/chromium/content_public/browser",
+]

chrome/android/java/res_autofill_assistant/values-v17/dimens.xml → chrome/android/features/autofill_assistant/java/res/values-v17/dimens.xml

@@ -5,4 +5,5 @@
 <resources>
     <dimen name="autofill_assistant_bottombar_horizontal_spacing">24dp</dimen>
     <dimen name="autofill_assistant_bottombar_vertical_spacing">20dp</dimen>
-</resources>
\ No newline at end of file
+    <dimen name="autofill_assistant_details_image_size">48dp</dimen>
+</resources>

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/payment/AutofillAssistantPaymentRequest.java → chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/payment/AutofillAssistantPaymentRequest.java

@@ -12,7 +12,7 @@ import android.view.View;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
-import org.chromium.chrome.R;
+import org.chromium.chrome.autofill_assistant.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_am.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="am">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_ar.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ar">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_bg.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bg">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_bn.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bn">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_ca.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ca">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_cs.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="cs">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_da.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="da">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_de.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="de">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_el.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="el">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_en-GB.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="en-GB">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_es-419.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es-419">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_es.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_et.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="et">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_fa.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fa">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_fi.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fi">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_fil.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fil">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_fr.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fr">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_gu.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="gu">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_hi.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hi">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_hr.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hr">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_hu.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hu">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_id.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="id">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_it.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="it">
+</translationbundle>
\ No newline at end of file

chrome/android/features/autofill_assistant/java/strings/translations/android_chrome_autofill_assistant_strings_iw.xtb

+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="iw">
+</translationbundle>
\ No newline at end of file