[Android] Rename buttons in Personalized Promo view

This cl renames the SigninButton and ChooseAccountButton to Primary and
Secondary button respectively.

Bug: 1095628
Change-Id: I6c502c8f6509a4e45395204f986ccb554fad1f91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2273238
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Reviewed-by: Alice Wang <aliceywang@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795543}

chrome/android/java/src/org/chromium/chrome/browser/signin/PersonalizedSigninPromoView.java

@@ -23,8 +23,8 @@ public class PersonalizedSigninPromoView extends LinearLayout {
     private ImageButton mDismissButton;
     private TextView mStatus;
     private TextView mDescription;
-    private ButtonCompat mSigninButton;
-    private Button mChooseAccountButton;
+    private ButtonCompat mPrimaryButton;
+    private Button mSecondaryButton;
 
     public PersonalizedSigninPromoView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -38,8 +38,8 @@ public class PersonalizedSigninPromoView extends LinearLayout {
         mDismissButton = findViewById(R.id.signin_promo_close_button);
         mStatus = findViewById(R.id.signin_promo_status_message);
         mDescription = findViewById(R.id.signin_promo_description);
-        mSigninButton = findViewById(R.id.signin_promo_signin_button);
-        mChooseAccountButton = findViewById(R.id.signin_promo_choose_account_button);
+        mPrimaryButton = findViewById(R.id.signin_promo_signin_button);
+        mSecondaryButton = findViewById(R.id.signin_promo_choose_account_button);
     }
 
     /**
@@ -73,14 +73,14 @@ public class PersonalizedSigninPromoView extends LinearLayout {
     /**
      * @return A reference to the signin button.
      */
-    public ButtonCompat getSigninButton() {
-        return mSigninButton;
+    public ButtonCompat getPrimaryButton() {
+        return mPrimaryButton;
     }
 
     /**
      * @return A reference to the choose account button.
      */
-    public Button getChooseAccountButton() {
-        return mChooseAccountButton;
+    public Button getSecondaryButton() {
+        return mSecondaryButton;
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java

@@ -267,10 +267,10 @@ public class SigninPromoController {
 
         view.getDescription().setText(mDescriptionStringIdNoAccount);
 
-        view.getSigninButton().setText(R.string.sign_in_to_chrome);
-        view.getSigninButton().setOnClickListener(v -> signinWithNewAccount(context));
+        view.getPrimaryButton().setText(R.string.sign_in_to_chrome);
+        view.getPrimaryButton().setOnClickListener(v -> signinWithNewAccount(context));
 
-        view.getChooseAccountButton().setVisibility(View.GONE);
+        view.getSecondaryButton().setVisibility(View.GONE);
     }
 
     private void setupHotState(final Context context, PersonalizedSigninPromoView view) {
@@ -282,12 +282,12 @@ public class SigninPromoController {
 
         String signinButtonText = context.getString(
                 R.string.signin_promo_continue_as, mProfileData.getGivenNameOrFullNameOrEmail());
-        view.getSigninButton().setText(signinButtonText);
-        view.getSigninButton().setOnClickListener(v -> signinWithDefaultAccount(context));
+        view.getPrimaryButton().setText(signinButtonText);
+        view.getPrimaryButton().setOnClickListener(v -> signinWithDefaultAccount(context));
 
-        view.getChooseAccountButton().setText(R.string.signin_promo_choose_another_account);
-        view.getChooseAccountButton().setOnClickListener(v -> signinWithNotDefaultAccount(context));
-        view.getChooseAccountButton().setVisibility(View.VISIBLE);
+        view.getSecondaryButton().setText(R.string.signin_promo_choose_another_account);
+        view.getSecondaryButton().setOnClickListener(v -> signinWithNotDefaultAccount(context));
+        view.getSecondaryButton().setVisibility(View.VISIBLE);
     }
 
     private int getNumImpressions() {

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java

@@ -132,8 +132,8 @@ public class SigninPromoUtil {
             SigninPromoController.OnDismissListener listener) {
         setupSigninPromoViewFromCache(signinPromoController, profileDataCache, view, listener);
         view.getStatusMessage().setVisibility(View.VISIBLE);
-        view.getSigninButton().setText(R.string.sync_promo_turn_on_sync);
-        view.getChooseAccountButton().setVisibility(View.GONE);
+        view.getPrimaryButton().setText(R.string.sync_promo_turn_on_sync);
+        view.getSecondaryButton().setVisibility(View.GONE);
     }
 
     /**