Skip to content

GitLab

T
tangled
Commit 8e067797 authored by Alice Wang's avatar Alice Wang Committed by Chromium LUCI CQ
Browse files
Options

[Signin][Modularization] Move account picker bottom sheet MVC to signin.ui 

This CL moves account picker bottom sheet MVC to signin.ui target.

Bug: 1149857
Change-Id: Ifc32d7d39b69bb052ad3b4bddbe576d4cbe5a059
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2613972
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842924}
parent 4f48bf58
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 42 deletions
chrome/android/BUILD.gn
View file @ 8e067797
......@@ -194,7 +194,6 @@ android_resources("chrome_app_java_resources") {
"//chrome/android/webapk/libs/common:splash_resources",
"//chrome/app:java_strings_grd",
"//chrome/browser/feedback/android:java_resources",
"//chrome/browser/incognito/interstitial/android:java_resources",
"//chrome/browser/password_check/android:java_resources",
"//chrome/browser/signin/services/android:java_resources",
"//chrome/browser/signin/ui/android:java_resources",
......@@ -318,7 +317,6 @@ android_library("chrome_java") {
"//chrome/browser/image_descriptions:java",
"//chrome/browser/image_editor/public:java",
"//chrome/browser/image_fetcher:java",
"//chrome/browser/incognito/interstitial/android:java",
"//chrome/browser/metrics_settings/android:java",
"//chrome/browser/notifications/chime/android:java",
"//chrome/browser/offline_pages/android:java",
......
chrome/android/chrome_java_resources.gni
View file @ 8e067797
......@@ -632,7 +632,6 @@ chrome_java_resources = [
"java/res/drawable/ic_error.xml",
"java/res/drawable/ic_error_googred_36dp.xml",
"java/res/drawable/ic_event_round.xml",
"java/res/drawable/ic_expand_more_in_circle_24dp.xml",
"java/res/drawable/ic_file_download_scheduled_24dp.xml",
"java/res/drawable/ic_find_in_page.xml",
"java/res/drawable/ic_fingerprint_grey500_36dp.xml",
......@@ -727,15 +726,6 @@ chrome_java_resources = [
"java/res/layout/account_chooser_dialog_title.xml",
"java/res/layout/account_divider_preference.xml",
"java/res/layout/account_management_account_row.xml",
"java/res/layout/account_picker_bottom_sheet_continue_button.xml",
"java/res/layout/account_picker_bottom_sheet_header.xml",
"java/res/layout/account_picker_bottom_sheet_view.xml",
"java/res/layout/account_picker_state_auth_error.xml",
"java/res/layout/account_picker_state_collapsed.xml",
"java/res/layout/account_picker_state_expanded.xml",
"java/res/layout/account_picker_state_general_error.xml",
"java/res/layout/account_picker_state_no_account.xml",
"java/res/layout/account_picker_state_signin_in_progress.xml",
"java/res/layout/add_languages_main.xml",
"java/res/layout/add_to_homescreen_dialog.xml",
"java/res/layout/add_to_menu_dialog.xml",
......
chrome/android/chrome_java_sources.gni
View file @ 8e067797
......@@ -1248,11 +1248,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java",
"java/src/org/chromium/chrome/browser/signin/SigninUtils.java",
"java/src/org/chromium/chrome/browser/signin/SyncPromoView.java",
"java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetCoordinator.java",
"java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetMediator.java",
"java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetProperties.java",
"java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetView.java",
"java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetViewBinder.java",
"java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerDelegateImpl.java",
"java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java",
"java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
......
chrome/android/java/src/org/chromium/chrome/browser/signin/SigninUtils.java
View file @ 8e067797
......@@ -19,12 +19,12 @@ import org.chromium.base.annotations.CalledByNative;
import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.signin.account_picker.AccountPickerBottomSheetCoordinator;
import org.chromium.chrome.browser.signin.account_picker.AccountPickerDelegateImpl;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.browser.signin.services.SigninManager;
import org.chromium.chrome.browser.signin.services.SigninMetricsUtils;
import org.chromium.chrome.browser.signin.services.WebSigninBridge;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerBottomSheetCoordinator;
import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
import org.chromium.chrome.browser.tabmodel.TabCreator;
import org.chromium.chrome.browser.tabmodel.TabModel;
......
chrome/android/javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetRenderTest.java
View file @ 8e067797
......@@ -42,7 +42,7 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.incognito.interstitial.IncognitoInterstitialDelegate;
import org.chromium.chrome.browser.night_mode.ChromeNightModeTestUtils;
import org.chromium.chrome.browser.signin.account_picker.AccountPickerBottomSheetCoordinator;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerBottomSheetCoordinator;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerDelegate;
import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
......
chrome/android/javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetTest.java
View file @ 8e067797
......@@ -49,14 +49,14 @@ import org.chromium.base.test.util.Batch;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.CriteriaHelper;
import org.chromium.base.test.util.MetricsUtils.HistogramDelta;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.incognito.interstitial.IncognitoInterstitialDelegate;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.signin.account_picker.AccountPickerBottomSheetCoordinator;
import org.chromium.chrome.browser.signin.ui.R;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerBottomSheetCoordinator;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerDelegate;
import org.chromium.chrome.browser.tabmodel.TabCreator;
import org.chromium.chrome.browser.tabmodel.TabModel;
......
chrome/browser/signin/ui/android/BUILD.gn
View file @ 8e067797
......@@ -9,10 +9,14 @@ android_library("java") {
":java_resources",
"//base:base_java",
"//chrome/browser/consent_auditor/android:java",
"//chrome/browser/feedback/android:java",
"//chrome/browser/flags:java",
"//chrome/browser/incognito/interstitial/android:java",
"//chrome/browser/preferences:java",
"//chrome/browser/profiles/android:java",
"//chrome/browser/signin/services/android:java",
"//chrome/browser/tabmodel:java",
"//components/browser_ui/android/bottomsheet:java",
"//components/browser_ui/settings/android:java",
"//components/browser_ui/widget/android:java",
"//components/embedder_support/android:util_java",
......@@ -42,6 +46,11 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/signin/ui/SigninPromoController.java",
"java/src/org/chromium/chrome/browser/signin/ui/SigninScrollView.java",
"java/src/org/chromium/chrome/browser/signin/ui/SigninView.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetCoordinator.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetMediator.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetProperties.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetView.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetViewBinder.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerCoordinator.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerDelegate.java",
"java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerDialogFragment.java",
......@@ -61,12 +70,22 @@ android_resources("java_resources") {
"java/res/drawable-xhdpi/chrome_sync_logo.png",
"java/res/drawable-xxhdpi/chrome_sync_logo.png",
"java/res/drawable-xxxhdpi/chrome_sync_logo.png",
"java/res/drawable/ic_expand_more_in_circle_24dp.xml",
"java/res/layout/account_picker_bottom_sheet_continue_button.xml",
"java/res/layout/account_picker_bottom_sheet_header.xml",
"java/res/layout/account_picker_bottom_sheet_view.xml",
"java/res/layout/account_picker_dialog_body.xml",
"java/res/layout/account_picker_incognito_row.xml",
"java/res/layout/account_picker_new_account_row.xml",
"java/res/layout/account_picker_new_account_row_legacy.xml",
"java/res/layout/account_picker_row.xml",
"java/res/layout/account_picker_row_legacy.xml",
"java/res/layout/account_picker_state_auth_error.xml",
"java/res/layout/account_picker_state_collapsed.xml",
"java/res/layout/account_picker_state_expanded.xml",
"java/res/layout/account_picker_state_general_error.xml",
"java/res/layout/account_picker_state_no_account.xml",
"java/res/layout/account_picker_state_signin_in_progress.xml",
"java/res/layout/confirm_import_sync_data.xml",
"java/res/layout/personalized_signin_promo_view_body.xml",
"java/res/layout/personalized_signin_promo_view_bookmarks.xml",
......@@ -80,6 +99,7 @@ android_resources("java_resources") {
"java/res/values/dimens.xml",
]
deps = [
"//chrome/browser/incognito/interstitial/android:java_resources",
"//chrome/browser/signin/services/android:java_resources",
"//chrome/browser/ui/android/strings:ui_strings_grd",
"//components/browser_ui/strings/android:browser_ui_strings_grd",
......
chrome/browser/signin/ui/android/DEPS 0 → 100644
View file @ 8e067797
include_rules = [
"+components/browser_ui/android/bottomsheet",
]
chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetCoordinator.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetCoordinator.java
View file @ 8e067797
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.signin.account_picker;
package org.chromium.chrome.browser.signin.ui.account_picker;
import android.app.Activity;
import android.view.View;
......@@ -15,8 +15,6 @@ import org.chromium.chrome.browser.incognito.interstitial.IncognitoInterstitialC
import org.chromium.chrome.browser.incognito.interstitial.IncognitoInterstitialDelegate;
import org.chromium.chrome.browser.signin.services.SigninMetricsUtils;
import org.chromium.chrome.browser.signin.services.SigninPreferencesManager;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerCoordinator;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerDelegate;
import org.chromium.chrome.browser.tabmodel.TabCreator;
import org.chromium.chrome.browser.tabmodel.TabModel;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
......
chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetMediator.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetMediator.java
View file @ 8e067797
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.signin.account_picker;
package org.chromium.chrome.browser.signin.ui.account_picker;
import android.accounts.Account;
import android.content.Context;
......@@ -12,12 +12,10 @@ import android.view.View.OnClickListener;
import androidx.annotation.Nullable;
import org.chromium.base.task.AsyncTask;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.signin.account_picker.AccountPickerBottomSheetProperties.ViewState;
import org.chromium.chrome.browser.signin.services.ProfileDataCache;
import org.chromium.chrome.browser.signin.services.SigninMetricsUtils;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerCoordinator;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerDelegate;
import org.chromium.chrome.browser.signin.ui.R;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerBottomSheetProperties.ViewState;
import org.chromium.components.signin.AccountManagerFacade;
import org.chromium.components.signin.AccountManagerFacadeProvider;
import org.chromium.components.signin.AccountUtils;
......
chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetProperties.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetProperties.java
View file @ 8e067797
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.signin.account_picker;
package org.chromium.chrome.browser.signin.ui.account_picker;
import android.view.View.OnClickListener;
......
chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetView.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetView.java
View file @ 8e067797
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.signin.account_picker;
package org.chromium.chrome.browser.signin.ui.account_picker;
import android.app.Activity;
import android.view.LayoutInflater;
......@@ -18,11 +18,9 @@ import androidx.annotation.StringRes;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.signin.account_picker.AccountPickerBottomSheetProperties.ViewState;
import org.chromium.chrome.browser.signin.services.DisplayableProfileData;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerFeatureUtils;
import org.chromium.chrome.browser.signin.ui.account_picker.ExistingAccountRowViewBinder;
import org.chromium.chrome.browser.signin.ui.R;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerBottomSheetProperties.ViewState;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
import org.chromium.ui.widget.ButtonCompat;
......@@ -170,7 +168,6 @@ class AccountPickerBottomSheetView implements BottomSheetContent {
continueButton.setText(continueAsButtonText);
}
@Override
public View getContentView() {
return mContentView;
......
chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetViewBinder.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerBottomSheetViewBinder.java
View file @ 8e067797
......@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.signin.account_picker;
package org.chromium.chrome.browser.signin.ui.account_picker;
import org.chromium.chrome.browser.signin.account_picker.AccountPickerBottomSheetProperties.ViewState;
import org.chromium.chrome.browser.signin.services.DisplayableProfileData;
import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerBottomSheetProperties.ViewState;
import org.chromium.ui.modelutil.PropertyKey;
import org.chromium.ui.modelutil.PropertyModel;
......
chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/account_picker/AccountPickerCoordinator.java
View file @ 8e067797
......@@ -57,9 +57,8 @@ public class AccountPickerCoordinator {
* account.
* @param selectedAccountName The name of the account that should be marked as selected.
* @param showIncognitoRow whether to show the incognito row in the account picker.
* TODO(crbug/1155123): Change this method to package private after modularization.
*/
public AccountPickerCoordinator(RecyclerView view, Listener listener,
AccountPickerCoordinator(RecyclerView view, Listener listener,
@Nullable String selectedAccountName, boolean showIncognitoRow) {
assert listener != null : "The argument AccountPickerCoordinator.Listener cannot be null!";
......@@ -90,9 +89,8 @@ public class AccountPickerCoordinator {
/**
* Destroys the resources used by the coordinator.
* TODO(crbug/1155123): Change this method to package private after modularization.
*/
public void destroy() {
void destroy() {
mMediator.destroy();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment