diff options
Diffstat (limited to 'chromium/chrome/android/features')
19 files changed, 170 insertions, 43 deletions
diff --git a/chromium/chrome/android/features/ar/ar_module.gni b/chromium/chrome/android/features/ar/ar_module.gni index 59e5c211345..65266de9917 100644 --- a/chromium/chrome/android/features/ar/ar_module.gni +++ b/chromium/chrome/android/features/ar/ar_module.gni @@ -19,5 +19,4 @@ ar_module_desc = { android_manifest = "//chrome/android/features/ar/AndroidManifest.xml" loadable_modules_32_bit = [ "$_libarcore_dir/armeabi-v7a/libarcore_sdk_c.so" ] loadable_modules_64_bit = [ "$_libarcore_dir/arm64-v8a/libarcore_sdk_c.so" ] - proguard_async = async_ar } diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn index 0e2b05bdc7a..e52425eb4b9 100644 --- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn +++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn @@ -34,7 +34,9 @@ android_library("java") { "//chrome/android:chrome_java", "//chrome/android:chrome_public_java", "//chrome/android/public/profiles:java", - "//chrome/lib/image_fetcher/public/android:java", + "//chrome/browser/image_fetcher:java", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//components/policy/android:policy_java", "//components/signin/core/browser/android:java", "//components/url_formatter/android:url_formatter_java", @@ -43,12 +45,12 @@ android_library("java") { "//third_party/android_deps:android_arch_lifecycle_common_java", "//third_party/android_deps:android_arch_lifecycle_runtime_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_collections_java", "//third_party/android_deps:com_android_support_coordinatorlayout_java", "//third_party/android_deps:com_android_support_design_java", "//third_party/android_deps:com_android_support_gridlayout_v7_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_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", @@ -67,6 +69,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomSheetContent.java", "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantCoordinator.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDimension.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", @@ -115,6 +118,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxViewBinder.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/AssistantOverlayImage.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java", "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayEventFilter.java", @@ -127,18 +131,28 @@ android_library("java") { "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantInfoPopup.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantPaymentMethodSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateChoiceOptions.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateSection.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantDateTime.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantShippingAddressSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantTermsSection.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpander.java", "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpanderAccordion.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSection.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionContainer.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantAdditionalSectionFactory.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantStaticTextSection.java", + "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java", ] annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] } generate_jni("jni_headers") { sources = [ + "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDimension.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", @@ -159,6 +173,7 @@ generate_jni("jni_headers") { } generate_jni("test_support_jni_headers") { + testonly = true sources = [ "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java", ] @@ -196,6 +211,7 @@ android_library("test_java") { "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataUiTest.java", + "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTextUtilsTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java", "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinatorTest.java", @@ -211,7 +227,8 @@ android_library("test_java") { "//base:base_java_test_support", "//chrome/android:chrome_java", "//chrome/android:chrome_test_util_java", - "//chrome/lib/image_fetcher/public/android:java", + "//chrome/browser/image_fetcher:java", + "//chrome/browser/ui/android/widget:java", "//chrome/test/android:chrome_java_test_support", "//components/autofill_assistant/browser:proto_java", "//content/public/android:content_java", diff --git a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd index 59f9fabe918..96e483d49f3 100644 --- a/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd +++ b/chromium/chrome/android/features/autofill_assistant/java/strings/android_chrome_autofill_assistant_strings.grd @@ -124,12 +124,6 @@ <message name="IDS_AUTOFILL_ASSISTANT_GOOGLE_TERMS_URL" desc="URL for Google Autofill Assistant Terms of Service" translateable="false"> http://support.google.com/assistant?p=fast_checkout </message> - <message name="IDS_AUTOFILL_ASSISTANT_3RD_PARTY_TERMS_REVIEW" desc="Message that indicates that the user wants to review the terms and conditions of a 3rd party's domain, e.g., 'odeon.co.uk'."> - Read and agree to the terms & conditions on <ph name="BEGIN_BOLD"><b></ph><ph name="DOMAIN">%1$s<ex>google.com</ex></ph><ph name="END_BOLD"></b></ph> later - </message> - <message name="IDS_AUTOFILL_ASSISTANT_3RD_PARTY_PRIVACY_NOTICE" desc="Privacy notice telling users that autofill assistant will send personal data to a third party’s website."> - Chrome will send personal data you selected to <ph name="BEGIN_BOLD"><b></ph><ph name="DOMAIN">%1$s<ex>google.com</ex></ph><ph name="END_BOLD"></b></ph> - </message> <message name="IDS_AUTOFILL_ASSISTANT_GIVE_UP" desc="Text label that is shown when autofill assistant cannot help anymore, because of a user action." internal_comment="TODO(wnwen): Remove duplication in components/autofill_assistant_strings.grdp"> diff --git a/chromium/chrome/android/features/dev_ui/BUILD.gn b/chromium/chrome/android/features/dev_ui/BUILD.gn index 7185d8eb3c2..235eda604e3 100644 --- a/chromium/chrome/android/features/dev_ui/BUILD.gn +++ b/chromium/chrome/android/features/dev_ui/BUILD.gn @@ -22,11 +22,10 @@ android_library("java") { } android_assets("pak_assets") { - renaming_sources = - [ "$root_gen_dir/chrome/bluetooth_internals_resources.pak" ] + renaming_sources = [ "$root_gen_dir/chrome/dev_ui_page_resources.pak" ] renaming_destinations = [ "dev_ui_resources.pak" ] deps = [ - "//chrome/browser/resources/bluetooth_internals:resources", + "//chrome/browser/resources:dev_ui_paks", ] disable_compression = true } diff --git a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni index 683a7197681..c8b6120c36e 100644 --- a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni +++ b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni @@ -5,11 +5,14 @@ declare_args() { # Whether Developer UI (chrome:// pages) should be split into a separate # Dynamic Feature Module (DFM: //docs/android_dynamic_feature_modules.md). - dfmify_dev_ui = false + dfmify_dev_ui = true } dev_ui_module_desc = { name = "dev_ui" + + # These deps are also used to support non-bundle flows, e.g., APK builds and + # unit tests. java_deps = [ "//chrome/android/features/dev_ui:java", "//chrome/android/features/dev_ui:pak_assets", diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn index 1c5b254e830..8170c501c7a 100644 --- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn @@ -32,10 +32,11 @@ android_library("test_java") { java_files = [ "javatests/src/org/chromium/chrome/browser/keyboard_accessory/AutofillKeyboardAccessoryIntegrationTest.java", + "javatests/src/org/chromium/chrome/browser/keyboard_accessory/FakeKeyboard.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingTestHelper.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingUiCaptureTest.java", - "javatests/src/org/chromium/chrome/browser/keyboard_accessory/FakeKeyboard.java", + "javatests/src/org/chromium/chrome/browser/keyboard_accessory/PasswordGenerationIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryViewTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewTest.java", "javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetViewTest.java", @@ -101,7 +102,4 @@ junit_binary("keyboard_accessory_junit_tests") { "//third_party/junit", "//third_party/mockito:mockito_java", ] - - srcjar_deps = - [ "//components/module_installer/android:module_installer_build_config" ] } diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn index e21c53ca167..761c8e9cc08 100644 --- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn @@ -16,7 +16,8 @@ android_library("internal_java") { "//chrome/android:chrome_public_java", "//chrome/android/features/keyboard_accessory/public:public_java", "//chrome/android/public/profiles:java", - "//chrome/lib/util/public/android:java", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//components/autofill/android:autofill_java", "//components/feature_engagement/public:public_java", "//content/public/android:content_java", diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd index de79a9d5bfa..6c343a054b4 100644 --- a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd +++ b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd @@ -107,7 +107,7 @@ Passwords available </message> <message name="IDS_AUTOFILL_KEYBOARD_ACCESSORY_MODERN_CONTENT_DESCRIPTION" desc="The text announced by the screen reader when the autofill suggestions and fallbacks are shown."> - Autofill suggestions available + Autofill suggestions available above the keyboard </message> <message name="IDS_KEYBOARD_ACCESSORY_SHEET_HIDE" desc="Description for the active icon button that closes an accessory sheet and brings back the keyboard."> Show keyboard diff --git a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn index 47398053e7d..59e631945fa 100644 --- a/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn +++ b/chromium/chrome/android/features/keyboard_accessory/public/BUILD.gn @@ -9,7 +9,7 @@ android_library("public_java") { "//base:base_java", "//chrome/android:chrome_public_java", "//components/autofill/android:autofill_java", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", ] java_files = [ "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponent.java", diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn index d7192a4c99f..df0336f1f22 100644 --- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn +++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn @@ -89,12 +89,17 @@ android_library("java") { "java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java", "java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java", "java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java", + "java/src/org/chromium/chrome/features/start_surface/SecondaryTasksSurfaceViewBinder.java", + "java/src/org/chromium/chrome/features/start_surface/TasksSurfaceViewBinder.java", ] deps = [ ":java_resources", "//base:base_java", "//chrome/android:chrome_java", + "//chrome/android/third_party/compositor_animator:compositor_animator_java", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:com_android_support_design_java", "//ui/android:ui_full_java", @@ -120,4 +125,11 @@ android_library("java") { } else { java_files += [ "dummy/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java" ] } + + if (!is_java_debug) { + if (!defined(proguard_configs)) { + proguard_configs = [] + } + proguard_configs += [ "proguard.flags" ] + } } diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn index bfef613e706..6c6222f77f9 100644 --- a/chromium/chrome/android/features/tab_ui/BUILD.gn +++ b/chromium/chrome/android/features/tab_ui/BUILD.gn @@ -77,15 +77,26 @@ android_resources("java_resources") { android_library("java") { java_files = [ + "java/src/org/chromium/chrome/browser/tasks/MostVisitedListCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediator.java", "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/TasksView.java", "java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileMediator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileView.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileViewProperties.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/SelectableTabGridView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMenuItemProperties.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParent.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemMediator.java", @@ -93,13 +104,18 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridIphItemViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallback.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelProperties.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelToolbarCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardViewProperties.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardView.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetMediator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetContent.java", - "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetProperties.java", - "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetToolbarCoordinator.java", - "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetViewBinder.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUiCoordinator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditor.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java", @@ -113,6 +129,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegateImpl.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProvider.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorCoordinator.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayout.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinder.java", @@ -128,8 +145,13 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProvider.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserver.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProviderConfiguration.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcher.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestrator.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsFetcherResults.java", + "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcher.java", ] deps = [ @@ -141,8 +163,9 @@ android_library("java") { "//chrome/android/features/start_surface/internal:java", "//chrome/android/public/profiles:java", "//chrome/app:java_strings_grd", + "//chrome/browser/ui/android/widget:java", + "//chrome/browser/util/android:java", "//chrome/lib/lifecycle/public/android:java", - "//chrome/lib/util/public/android:java", "//components/embedder_support/android:web_contents_delegate_java", "//components/feature_engagement:feature_engagement_java", "//components/policy/android:policy_java", @@ -152,14 +175,11 @@ android_library("java") { "//third_party/android_deps:android_arch_lifecycle_runtime_java", "//third_party/android_deps:android_arch_lifecycle_viewmodel_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_recyclerview_v7_java", - "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_deps:com_android_support_support_compat_java", "//third_party/android_deps:com_android_support_support_v13_java", "//ui/android:ui_java", ] - - if (async_tab_ui) { - proguard_configs = [ "//base/android/proguard/chromium_code.flags" ] - } } diff --git a/chromium/chrome/android/features/tab_ui/buildflags.gni b/chromium/chrome/android/features/tab_ui/buildflags.gni index 06376993369..e15c9ae3e17 100644 --- a/chromium/chrome/android/features/tab_ui/buildflags.gni +++ b/chromium/chrome/android/features/tab_ui/buildflags.gni @@ -5,7 +5,4 @@ declare_args() { # Controls the feature being a DFM or not. disable_tab_ui_dfm = true - - # Whether to create tab_ui module as an asynchronous DFM. - async_tab_ui = false } diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd index 648b62d5244..91102cea08e 100644 --- a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd +++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd @@ -180,6 +180,12 @@ <message name="IDS_TAB_GRID_DIALOG_REMOVE_FROM_GROUP" desc="This text shows on the ungroup bar in TabGridDialog. When user drags a tab and drops it on the ungroup bar, this tab will be moved out of the group."> Remove from group </message> + <message name="IDS_TAB_GRID_DIALOG_TOOLBAR_REMOVE_FROM_GROUP" desc="This text shows in the TabGridDialog toolbar menu as one menu item. When user selects this item, user will enter a selection mode where they can select tabs that they want to move out of tab group. Two things worth mentioning here: 1. The remove here does not mean delete, it means move tab out of tab group and becomes a single tab. 2. If the translation goes beyond 30 characters, replace it with "Remove tabs" to keep this text under 30 characters."> + Remove tabs from group + </message> + <message name="IDS_TAB_GRID_DIALOG_SELECTION_MODE_REMOVE" desc="This texts shows on the action button of tab group selection mode. When user clicks this action button, all the tabs that are currently selected will be moved out of tab group. One thing worth mentioning here is that the remove here does not mean delete, it means move tab out of tab group and becomes a single tab."> + Remove + </message> <!-- Tab Grid Drag-and-drop IPH strings --> <message name="IDS_IPH_DRAG_AND_DROP_INTRODUCTION" desc="This text shows on the entry point for the in-product help for drag-and-drop. It introduces that this IPH is about how to use drag-and-drop."> diff --git a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni index 39da8ecd8af..6714b8187f9 100644 --- a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni +++ b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni @@ -6,15 +6,18 @@ import( "//chrome/android/features/start_surface/public/start_surface_public_java_sources.gni") public_tab_management_java_sources = [ + "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/MostVisitedListProperties.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurface.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/EmptyTabGroupModelFilterObserver.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUi.java", + "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupPopupUi.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegate.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementModuleProvider.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcher.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContext.java", + "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestions.java", "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestion.java", ] @@ -22,19 +25,31 @@ public_tab_management_java_sources += start_surface_public_java_sources tab_management_test_java_sources = [ "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/AssertsTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParentTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridMessageCardViewBinderTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridPanelViewBinderTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorLayoutBinderTest.java", + "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabUiTestHelper.java", "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TestRecyclerViewSimpleViewBinder.java", ] tab_management_junit_java_sources = [ + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/MostVisitedListViewBinderUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilterUnitTest.java", - "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/GridTabSwitcherMediatorUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtilsUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallbackUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupTitleEditorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSelectionEditorActionProviderUnitTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTests.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserverTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestratorTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProviderTest.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsClientFetcherTest.java", ] diff --git a/chromium/chrome/android/features/tab_ui/tab_ui_module.gni b/chromium/chrome/android/features/tab_ui/tab_ui_module.gni index c3b61ed9c3a..e153234108c 100644 --- a/chromium/chrome/android/features/tab_ui/tab_ui_module.gni +++ b/chromium/chrome/android/features/tab_ui/tab_ui_module.gni @@ -8,5 +8,4 @@ tab_ui_module_desc = { name = "tab_ui" java_deps = [ "//chrome/android/features/tab_ui:java" ] android_manifest = "//chrome/android/features/tab_ui/AndroidManifest.xml" - proguard_async = async_tab_ui } diff --git a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn index 8b184fecf0f..b7dcdf918ae 100644 --- a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn +++ b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn @@ -2,27 +2,77 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/buildflag_header.gni") import("//build/config/android/rules.gni") +import("//chrome/android/modules/buildflags.gni") +import("//tools/grit/grit_rule.gni") + +android_resources("java_resources") { + resource_dirs = [ "java/res" ] + custom_package = "org.chromium.chrome.features.test_dummy" +} android_library("java") { deps = [ + ":base_module_java", + ":java_resources", "//base:base_java", "//chrome/android/features/test_dummy/public:java", "//third_party/android_deps:android_support_v7_appcompat_java", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", ] java_files = [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ] + + annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] + deps += [ "//base:jni_java" ] +} + +source_set("native") { + sources = [ + "test_dummy_impl.cc", + ] + + deps = [ + ":jni_headers", + ":resources_native", + "//base", + "//ui/base", + ] } -# Code that should go into the base module. +# Java code that should go into the base module. If this were a normal feature, +# this target would reside in the client code using the module. Since this is a +# test dummy module, it has no pre-existing client, and hence the target is +# squatting here for convenience. The same is true for the corresponding native +# target. android_library("base_module_java") { deps = [ "//base:base_java", + "//chrome/android/features/test_dummy/public:java", "//chrome/android/modules/test_dummy/provider:java", + "//chrome/android/modules/test_dummy/public:java", "//third_party/android_deps:android_support_v7_appcompat_java", ] java_files = [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java", ] } + +generate_jni("jni_headers") { + sources = [ + "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java", + ] +} + +# Cannot call this just "resources" since all targets with that name in +# //chrome/android need a build_config, which grit targets don't have. +grit("resources_native") { + source = "resources/resources.grd" + outputs = [ + "grit/test_dummy_resources.h", + "test_dummy_resources.pak", + ] + output_dir = "$root_gen_dir/chrome" + depfile_dir = target_gen_dir +} diff --git a/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd b/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd new file mode 100644 index 00000000000..2f90200e989 --- /dev/null +++ b/chromium/chrome/android/features/test_dummy/internal/resources/resources.grd @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" + current_release="1" + output_all_resource_defines="false"> + <outputs> + <output filename="grit/test_dummy_resources.h" + type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="test_dummy_resources.pak" + type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <include name="IDR_TEST_DUMMY_TEST_RESOURCE" + file="test_resource.txt" + type="BINDATA" /> + </includes> + </release> +</grit> diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn index 2eb9621c302..feabb434a16 100644 --- a/chromium/chrome/android/features/vr/BUILD.gn +++ b/chromium/chrome/android/features/vr/BUILD.gn @@ -119,6 +119,7 @@ android_library("java") { "//base:base_java", "//base:jni_java", "//chrome/android:chrome_java", + "//chrome/browser/util/android:java", "//components/policy/android:policy_java", "//content/public/android:content_java", "//device/vr:java", @@ -126,16 +127,13 @@ android_library("java") { "//third_party/android_deps:android_arch_lifecycle_runtime_java", "//third_party/android_deps:android_arch_lifecycle_viewmodel_java", "//third_party/android_deps:android_support_v7_appcompat_java", - "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/gvr-android-keyboard:kb_java", "//third_party/gvr-android-sdk:gvr_common_java", "//ui/android:ui_full_java", "//ui/android:ui_utils_java", ] - if (async_vr) { - proguard_configs = [ "//base/android/proguard/chromium_code.flags" ] - } annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] } diff --git a/chromium/chrome/android/features/vr/vr_module.gni b/chromium/chrome/android/features/vr/vr_module.gni index 76533bd1166..55486408291 100644 --- a/chromium/chrome/android/features/vr/vr_module.gni +++ b/chromium/chrome/android/features/vr/vr_module.gni @@ -11,8 +11,7 @@ vr_module_desc = { name = "vr" java_deps = [ "//chrome/android/features/vr:java" ] android_manifest = "//chrome/android/features/vr/java/AndroidManifest.xml" - proguard_async = async_vr - if (use_native_modules && modularize_vr_native) { + if (use_native_partitions) { native_deps = [ "//chrome/browser/vr:vr_ui" ] native_entrypoints = "//chrome/browser/vr/module_exports.lst" } |