PaymentRequest: Rename ContactInfo to PayerInfo.

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser.payments.ui;
 
 import static org.chromium.chrome.browser.payments.ui.PaymentRequestSection.EDIT_BUTTON_GONE;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ skipping 45 matching lines @@
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * The PaymentRequest UI.
  */
 public class PaymentRequestUI implements DialogInterface.OnDismissListener, View.OnClickListener,
         PaymentRequestSection.SectionDelegate {
     public static final int TYPE_SHIPPING_ADDRESSES = 1;
     public static final int TYPE_SHIPPING_OPTIONS = 2;
-    public static final int TYPE_CONTACT_DETAILS = 3;
+    public static final int TYPE_PAYER_INFO_DETAILS = 3;
     public static final int TYPE_PAYMENT_METHODS = 4;
 
     public static final int SELECTION_RESULT_ASYNCHRONOUS_VALIDATION = 1;
     public static final int SELECTION_RESULT_EDITOR_LAUNCH = 2;
     public static final int SELECTION_RESULT_NONE = 3;
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
         TYPE_SHIPPING_ADDRESSES,
         TYPE_SHIPPING_OPTIONS,
-        TYPE_CONTACT_DETAILS,
+        TYPE_PAYER_INFO_DETAILS,
         TYPE_PAYMENT_METHODS
     })
     public @interface DataType {}
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
             SELECTION_RESULT_ASYNCHRONOUS_VALIDATION,
             SELECTION_RESULT_EDITOR_LAUNCH,
             SELECTION_RESULT_NONE,
     })
@@ skipping 166 matching lines @@
     private static final int DIALOG_EXIT_ANIMATION_MS = 195;
 
     private static PaymentRequestObserverForTest sObserverForTest;
 
     /** Notifies tests that the [PAY] button can be clicked. */
     private final NotifierForTest mReadyToPayNotifierForTest;
 
     private final Context mContext;
     private final Client mClient;
     private final boolean mRequestShipping;
-    private final boolean mRequestContactDetails;
+    private final boolean mRequestPayerInfoDetails;
 
     private final Dialog mDialog;
     private final EditorView mEditorView;
     private final EditorView mCardEditorView;
     private final ViewGroup mFullContainer;
     private final ViewGroup mRequestView;
     private final PaymentRequestUiErrorView mErrorView;
     private final Callback<PaymentInformation> mUpdateSectionsCallback;
 
     private ScrollView mPaymentContainer;
     private LinearLayout mPaymentContainerLayout;
     private DualControlLayout mButtonBar;
     private Button mEditButton;
     private Button mPayButton;
     private View mCloseButton;
     private View mSpinnyLayout;
 
     private LineItemBreakdownSection mOrderSummarySection;
     private ExtraTextSection mShippingSummarySection;
     private OptionSection mShippingAddressSection;
     private OptionSection mShippingOptionSection;
-    private OptionSection mContactDetailsSection;
+    private OptionSection mPayerInfoDetailsSection;
     private OptionSection mPaymentMethodSection;
     private List<SectionSeparator> mSectionSeparators;
 
     private PaymentRequestSection mSelectedSection;
     private boolean mIsShowingEditDialog;
     private boolean mIsProcessingPayClicked;
     private boolean mIsClientClosing;
     private boolean mIsClientCheckingSelection;
     private boolean mIsShowingSpinner;
     private boolean mIsEditingPaymentItem;
     private boolean mIsClosing;
 
     private SectionInformation mPaymentMethodSectionInformation;
     private SectionInformation mShippingAddressSectionInformation;
     private SectionInformation mShippingOptionsSectionInformation;
-    private SectionInformation mContactDetailsSectionInformation;
+    private SectionInformation mPayerInfoDetailsSectionInformation;
 
     private Animator mSheetAnimator;
     private FocusAnimator mSectionAnimator;
     private int mAnimatorTranslation;
     private boolean mIsInitialLayoutComplete;
 
     /**
      * Builds the UI for PaymentRequest.
      *
      * @param activity        The activity on top of which the UI should be displayed.
      * @param client          The consumer of the PaymentRequest UI.
      * @param requestShipping Whether the UI should show the shipping address and option selection.
-     * @param requestContact  Whether the UI should show the email address and phone number
+     * @param requestPayerInfo  Whether the UI should show the email address and phone number
      *                        selection.
      * @param canAddCards     Whether the UI should show the [+ADD CARD] button. This can be false,
      *                        for example, when the merchant does not accept credit cards, so
      *                        there's no point in adding cards within PaymentRequest UI.
      * @param title           The title to show at the top of the UI. This can be, for example, the
      *                        &lt;title&gt; of the merchant website. If the string is too long for
      *                        UI, it elides at the end.
      * @param origin          The origin (part of URL) to show under the title. For example,
      *                        "https://shop.momandpop.com". If the origin is too long for the UI, it
      *                        should elide according to:
      * https://www.chromium.org/Home/chromium-security/enamel#TOC-Eliding-Origin-Names-And-Hostnames
      */
     public PaymentRequestUI(Activity activity, Client client, boolean requestShipping,
-            boolean requestContact, boolean canAddCards, String title, String origin) {
+            boolean requestPayerInfo, boolean canAddCards, String title, String origin) {
         mContext = activity;
         mClient = client;
         mRequestShipping = requestShipping;
-        mRequestContactDetails = requestContact;
+        mRequestPayerInfoDetails = requestPayerInfo;
         mAnimatorTranslation = activity.getResources().getDimensionPixelSize(
                 R.dimen.payments_ui_translation);
 
         mErrorView = (PaymentRequestUiErrorView) LayoutInflater.from(mContext).inflate(
                 R.layout.payment_request_error, null);
         mErrorView.initialize(title, origin);
 
         mReadyToPayNotifierForTest = new NotifierForTest(new Runnable() {
             @Override
             public void run() {
                 if (sObserverForTest != null && isAcceptingUserInput() && mPayButton.isEnabled()) {
                     sObserverForTest.onPaymentRequestReadyToPay(PaymentRequestUI.this);
                 }
             }
         });
 
         // This callback will be fired if mIsClientCheckingSelection is true.
         mUpdateSectionsCallback = new Callback<PaymentInformation>() {
             @Override
             public void onResult(PaymentInformation result) {
                 mIsClientCheckingSelection = false;
                 updateOrderSummarySection(result.getShoppingCart());
                 if (mRequestShipping) {
                     updateSection(TYPE_SHIPPING_ADDRESSES, result.getShippingAddresses());
                     updateSection(TYPE_SHIPPING_OPTIONS, result.getShippingOptions());
                 }
-                if (mRequestContactDetails) {
-                    updateSection(TYPE_CONTACT_DETAILS, result.getContactDetails());
+                if (mRequestPayerInfoDetails) {
+                    updateSection(TYPE_PAYER_INFO_DETAILS, result.getPayerInfoDetails());
                 }
                 updateSection(TYPE_PAYMENT_METHODS, result.getPaymentMethods());
                 if (mShippingAddressSectionInformation.getSelectedItem() == null) {
                     expand(mShippingAddressSection);
                 } else {
                     expand(null);
                 }
                 updatePayButtonEnabled();
                 notifySelectionChecked();
             }
@@ skipping 63 matching lines @@
                         mShippingSummarySection.setSummaryText(
                                 selectedShippingAddress, selectedShippingName);
                         mShippingSummarySection.setSummaryProperties(
                                 TruncateAt.MIDDLE, true, null, true);
 
                         // Indicate the shipping option below the address.
                         mShippingSummarySection.setExtraText(selectedShippingOptionLabel);
                     }
                 }
 
-                if (mRequestContactDetails) {
-                    updateSection(TYPE_CONTACT_DETAILS, result.getContactDetails());
+                if (mRequestPayerInfoDetails) {
+                    updateSection(TYPE_PAYER_INFO_DETAILS, result.getPayerInfoDetails());
                 }
 
                 updateSection(TYPE_PAYMENT_METHODS, result.getPaymentMethods());
                 updatePayButtonEnabled();
 
                 // Hide the loading indicators and show the real sections.
                 mPaymentContainer.setVisibility(View.VISIBLE);
                 mButtonBar.setVisibility(View.VISIBLE);
                 mRequestView.removeView(mSpinnyLayout);
                 mRequestView.addOnLayoutChangeListener(new SheetEnlargingAnimator(false));
@@ skipping 43 matching lines @@
         mPaymentContainerLayout =
                 (LinearLayout) mRequestView.findViewById(R.id.payment_container_layout);
         mOrderSummarySection = new LineItemBreakdownSection(
                 activity, activity.getString(R.string.payments_order_summary_label), this);
         mShippingSummarySection = new ExtraTextSection(
                 activity, activity.getString(R.string.payments_shipping_summary_label), this);
         mShippingAddressSection = new OptionSection(
                 activity, activity.getString(R.string.payments_shipping_address_label), this);
         mShippingOptionSection = new OptionSection(
                 activity, activity.getString(R.string.payments_shipping_option_label), this);
-        mContactDetailsSection = new OptionSection(
-                activity, activity.getString(R.string.payments_contact_details_label), this);
+        mPayerInfoDetailsSection = new OptionSection(
+                activity, activity.getString(R.string.payments_payer_info_details_label), this);
         mPaymentMethodSection = new OptionSection(
                 activity, activity.getString(R.string.payments_method_of_payment_label), this);
 
         // Some sections conditionally allow adding new options.
         mShippingOptionSection.setCanAddItems(false);
         mPaymentMethodSection.setCanAddItems(canAddCards);
 
         // Add the necessary sections to the layout.
         mPaymentContainerLayout.addView(mOrderSummarySection, new LinearLayout.LayoutParams(
                 LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
         mSectionSeparators.add(new SectionSeparator(mPaymentContainerLayout));
         if (mRequestShipping) {
             // The shipping breakout sections are only added if they are needed.
             mPaymentContainerLayout.addView(mShippingSummarySection, new LinearLayout.LayoutParams(
                     LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
             mSectionSeparators.add(new SectionSeparator(mPaymentContainerLayout));
         }
         mPaymentContainerLayout.addView(mPaymentMethodSection, new LinearLayout.LayoutParams(
                 LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
-        if (mRequestContactDetails) {
-            // Contact details are optional, depending on the merchant website.
+        if (mRequestPayerInfoDetails) {
+            // Payer info details are optional, depending on the merchant website.
             mSectionSeparators.add(new SectionSeparator(mPaymentContainerLayout));
-            mPaymentContainerLayout.addView(mContactDetailsSection, new LinearLayout.LayoutParams(
+            mPaymentContainerLayout.addView(mPayerInfoDetailsSection, new LinearLayout.LayoutParams(
                     LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
         }
         mRequestView.addOnLayoutChangeListener(new FadeInAnimator());
         mRequestView.addOnLayoutChangeListener(new PeekingAnimator());
 
         // Enabled in updatePayButtonEnabled() when the user has selected all payment options.
         mPayButton.setEnabled(false);
     }
 
     /**
@@ skipping 71 matching lines @@
      *
      * @param section The shipping options.
      */
     public void updateSection(@DataType int whichSection, SectionInformation section) {
         if (whichSection == TYPE_SHIPPING_ADDRESSES) {
             mShippingAddressSectionInformation = section;
             mShippingAddressSection.update(section);
         } else if (whichSection == TYPE_SHIPPING_OPTIONS) {
             mShippingOptionsSectionInformation = section;
             mShippingOptionSection.update(section);
-        } else if (whichSection == TYPE_CONTACT_DETAILS) {
-            mContactDetailsSectionInformation = section;
-            mContactDetailsSection.update(section);
+        } else if (whichSection == TYPE_PAYER_INFO_DETAILS) {
+            mPayerInfoDetailsSectionInformation = section;
+            mPayerInfoDetailsSection.update(section);
         } else if (whichSection == TYPE_PAYMENT_METHODS) {
             mPaymentMethodSectionInformation = section;
             mPaymentMethodSection.update(section);
         }
         mIsEditingPaymentItem = false;
         updateSectionButtons();
         updatePayButtonEnabled();
     }
 
     @Override
     public void onPaymentOptionChanged(final PaymentRequestSection section, PaymentOption option) {
         @SelectionResult int result = SELECTION_RESULT_NONE;
         if (section == mShippingAddressSection
                 && mShippingAddressSectionInformation.getSelectedItem() != option) {
             mShippingAddressSectionInformation.setSelectedItem(option);
             result = mClient.onSectionOptionSelected(
                     TYPE_SHIPPING_ADDRESSES, option, mUpdateSectionsCallback);
         } else if (section == mShippingOptionSection
                 && mShippingOptionsSectionInformation.getSelectedItem() != option) {
             mShippingOptionsSectionInformation.setSelectedItem(option);
             result = mClient.onSectionOptionSelected(
                     TYPE_SHIPPING_OPTIONS, option, mUpdateSectionsCallback);
-        } else if (section == mContactDetailsSection) {
-            mContactDetailsSectionInformation.setSelectedItem(option);
-            result = mClient.onSectionOptionSelected(TYPE_CONTACT_DETAILS, option, null);
+        } else if (section == mPayerInfoDetailsSection) {
+            mPayerInfoDetailsSectionInformation.setSelectedItem(option);
+            result = mClient.onSectionOptionSelected(TYPE_PAYER_INFO_DETAILS, option, null);
         } else if (section == mPaymentMethodSection) {
             mPaymentMethodSectionInformation.setSelectedItem(option);
             result = mClient.onSectionOptionSelected(TYPE_PAYMENT_METHODS, option, null);
         }
 
         updateStateFromResult(section, result);
     }
 
     @Override
     public void onAddPaymentOption(PaymentRequestSection section) {
         assert section != mShippingOptionSection;
 
         // There's no way to add new shipping options, so users adding an option via the shipping
         // summary's button have to be adding an address.  Expand the sheet when this happens so
         // that the shipping address section properly appears afterward.
         if (section == mShippingSummarySection) {
             expand(null);
             section = mShippingAddressSection;
         }
 
         @SelectionResult int result = SELECTION_RESULT_NONE;
         if (section == mShippingAddressSection) {
             result = mClient.onSectionAddOption(TYPE_SHIPPING_ADDRESSES, mUpdateSectionsCallback);
-        } else if (section == mContactDetailsSection) {
-            result = mClient.onSectionAddOption(TYPE_CONTACT_DETAILS, null);
+        } else if (section == mPayerInfoDetailsSection) {
+            result = mClient.onSectionAddOption(TYPE_PAYER_INFO_DETAILS, null);
         } else if (section == mPaymentMethodSection) {
             result = mClient.onSectionAddOption(TYPE_PAYMENT_METHODS, null);
         }
 
         updateStateFromResult(section, result);
     }
 
     void updateStateFromResult(PaymentRequestSection section, @SelectionResult int result) {
         mIsClientCheckingSelection = result == SELECTION_RESULT_ASYNCHRONOUS_VALIDATION;
         mIsEditingPaymentItem = result == SELECTION_RESULT_EDITOR_LAUNCH;
@@ skipping 44 matching lines @@
             PaymentRequestSection section = (PaymentRequestSection) v;
             if (section.getEditButtonState() != EDIT_BUTTON_GONE) return;
         }
 
         if (v == mOrderSummarySection) {
             expand(mOrderSummarySection);
         } else if (v == mShippingSummarySection || v == mShippingAddressSection) {
             expand(mShippingAddressSection);
         } else if (v == mShippingOptionSection) {
             expand(mShippingOptionSection);
-        } else if (v == mContactDetailsSection) {
-            expand(mContactDetailsSection);
+        } else if (v == mPayerInfoDetailsSection) {
+            expand(mPayerInfoDetailsSection);
         } else if (v == mPaymentMethodSection) {
             expand(mPaymentMethodSection);
         } else if (v == mPayButton) {
             processPayButton();
         } else if (v == mEditButton) {
             if (mIsShowingEditDialog) {
                 dismissDialog(true);
             } else {
                 expand(mOrderSummarySection);
             }
@@ skipping 78 matching lines @@
         } else {
             mRequestView.removeView(mSpinnyLayout);
             mRequestView.addView(mPaymentContainer);
             mRequestView.addView(mButtonBar);
 
             if (mIsShowingEditDialog) expand(mSelectedSection);
         }
     }
 
     private void updatePayButtonEnabled() {
-        boolean contactInfoOk = !mRequestContactDetails
-                || (mContactDetailsSectionInformation != null
-                           && mContactDetailsSectionInformation.getSelectedItem() != null);
+        boolean payerInfoOk = !mRequestPayerInfoDetails
+                || (mPayerInfoDetailsSectionInformation != null
+                           && mPayerInfoDetailsSectionInformation.getSelectedItem() != null);
         boolean shippingInfoOk = !mRequestShipping
                 || (mShippingAddressSectionInformation != null
                            && mShippingAddressSectionInformation.getSelectedItem() != null
                            && mShippingOptionsSectionInformation != null
                            && mShippingOptionsSectionInformation.getSelectedItem() != null);
-        mPayButton.setEnabled(contactInfoOk && shippingInfoOk
+        mPayButton.setEnabled(payerInfoOk && shippingInfoOk
                 && mPaymentMethodSectionInformation != null
                 && mPaymentMethodSectionInformation.getSelectedItem() != null
                 && !mIsClientCheckingSelection
                 && !mIsEditingPaymentItem
                 && !mIsClosing);
         mReadyToPayNotifierForTest.run();
     }
 
     /** @return Whether or not the dialog can be closed via the X close button. */
     private boolean isAcceptingCloseButton() {
@@ skipping 60 matching lines @@
                     updateOrderSummarySection(result);
                     updateSectionVisibility();
                 }
             });
         } else if (mSelectedSection == mShippingAddressSection) {
             mClient.getSectionInformation(
                     TYPE_SHIPPING_ADDRESSES, createUpdateSectionCallback(TYPE_SHIPPING_ADDRESSES));
         } else if (mSelectedSection == mShippingOptionSection) {
             mClient.getSectionInformation(
                     TYPE_SHIPPING_OPTIONS, createUpdateSectionCallback(TYPE_SHIPPING_OPTIONS));
-        } else if (mSelectedSection == mContactDetailsSection) {
+        } else if (mSelectedSection == mPayerInfoDetailsSection) {
             mClient.getSectionInformation(
-                    TYPE_CONTACT_DETAILS, createUpdateSectionCallback(TYPE_CONTACT_DETAILS));
+                    TYPE_PAYER_INFO_DETAILS, createUpdateSectionCallback(TYPE_PAYER_INFO_DETAILS));
         } else if (mSelectedSection == mPaymentMethodSection) {
             mClient.getSectionInformation(
                     TYPE_PAYMENT_METHODS, createUpdateSectionCallback(TYPE_PAYMENT_METHODS));
         } else {
             updateSectionVisibility();
         }
     }
 
     private Callback<SectionInformation> createUpdateSectionCallback(@DataType final int type) {
         return new Callback<SectionInformation>() {
             @Override
             public void onResult(SectionInformation result) {
                 updateSection(type, result);
                 updateSectionVisibility();
             }
         };
     }
 
     /** Update the display status of each expandable section in the full dialog. */
     private void updateSectionVisibility() {
         startSectionResizeAnimation();
         mOrderSummarySection.focusSection(mSelectedSection == mOrderSummarySection);
         mShippingAddressSection.focusSection(mSelectedSection == mShippingAddressSection);
         mShippingOptionSection.focusSection(mSelectedSection == mShippingOptionSection);
-        mContactDetailsSection.focusSection(mSelectedSection == mContactDetailsSection);
+        mPayerInfoDetailsSection.focusSection(mSelectedSection == mPayerInfoDetailsSection);
         mPaymentMethodSection.focusSection(mSelectedSection == mPaymentMethodSection);
         updateSectionButtons();
     }
 
     /**
      * Updates the enabled/disbled state of each section's edit button.
      *
      * Only the top-most button is enabled -- the others are disabled so the user is directed
      * through the form from top to bottom.
      */
@@ skipping 254 matching lines @@
     public ViewGroup getShippingAddressSectionForTest() {
         return mShippingAddressSection;
     }
 
     @VisibleForTesting
     public ViewGroup getPaymentMethodSectionForTest() {
         return mPaymentMethodSection;
     }
 
     @VisibleForTesting
-    public ViewGroup getContactDetailsSectionForTest() {
-        return mContactDetailsSection;
+    public ViewGroup getPayerInfoDetailsSectionForTest() {
+        return mPayerInfoDetailsSection;
     }
 
     private void notifyReadyForInput() {
         if (sObserverForTest != null && isAcceptingUserInput()) {
             sObserverForTest.onPaymentRequestReadyForInput(this);
         }
     }
 
     private void notifySelectionChecked() {
         if (sObserverForTest != null) {
             sObserverForTest.onPaymentRequestSelectionChecked(this);
         }
     }
 }