[Payments] Remove country from shipping label in bottom and fullsheet.

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.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;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
 import org.chromium.chrome.browser.payments.ui.Completable;
 import org.chromium.chrome.browser.payments.ui.LineItem;
 import org.chromium.chrome.browser.payments.ui.PaymentInformation;
 import org.chromium.chrome.browser.payments.ui.PaymentOption;
+import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSection.FocusChangedObserver;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestUI;
 import org.chromium.chrome.browser.payments.ui.SectionInformation;
 import org.chromium.chrome.browser.payments.ui.ShoppingCart;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
@@ skipping 23 matching lines @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
 /**
  * Android implementation of the PaymentRequest service defined in
  * components/payments/payment_request.mojom.
  */
 public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Client,
         PaymentApp.InstrumentsCallback, PaymentInstrument.InstrumentDetailsCallback,
-        PaymentResponseHelper.PaymentResponseRequesterDelegate {
+        PaymentResponseHelper.PaymentResponseRequesterDelegate, FocusChangedObserver {
     /**
      * A test-only observer for the PaymentRequest service implementation.
      */
     public interface PaymentRequestServiceObserverForTest {
         /**
          * Called when an abort request was denied.
          */
         void onPaymentRequestServiceUnableToAbort();
 
         /**
@@ skipping 285 matching lines @@
             // Log the number of suggested shipping addresses.
             mJourneyLogger.setNumberOfSuggestionsShown(
                     PaymentRequestJourneyLogger.SECTION_SHIPPING_ADDRESS, addresses.size());
 
             // Automatically select the first address if one is complete and if the merchant does
             // not require a shipping address to calculate shipping costs.
             int firstCompleteAddressIndex = SectionInformation.NO_SELECTION;
             if (mUiShippingOptions.getSelectedItem() != null && !addresses.isEmpty()
                     && addresses.get(0).isComplete()) {
                 firstCompleteAddressIndex = 0;
+
+                // The initial label for the selected shipping address should not include the
+                // country.
+                addresses.get(firstCompleteAddressIndex).setShippingAddressLabelWithoutCountry();
             }
 
             mShippingAddressesSection =
                     new SectionInformation(PaymentRequestUI.TYPE_SHIPPING_ADDRESSES,
                             firstCompleteAddressIndex, addresses);
         }
 
         if (requestPayerName || requestPayerPhone || requestPayerEmail) {
             Set<String> uniqueContactInfos = new HashSet<>();
             mContactEditor = new ContactEditor(
@@ skipping 45 matching lines @@
             mContactSection = new SectionInformation(
                     PaymentRequestUI.TYPE_CONTACT_DETAILS, firstCompleteContactIndex, contacts);
         }
 
         mUI = new PaymentRequestUI(mContext, this, requestShipping,
                 requestPayerName || requestPayerPhone || requestPayerEmail,
                 mMerchantSupportsAutofillPaymentInstruments, mMerchantName, mOrigin,
                 new ShippingStrings(
                         options == null ? PaymentShippingType.SHIPPING : options.shippingType));
 
+        // Add the callback to change the label of shipping addresses depending on the focus.
+        if (requestShipping) mUI.setShippingAddressSectionFocusChangedObserver(this);
+
         if (mFavicon != null) mUI.setTitleBitmap(mFavicon);
         mFavicon = null;
 
         mAddressEditor.setEditorView(mUI.getEditorView());
         mCardEditor.setEditorView(mUI.getCardEditorView());
         if (mContactEditor != null) mContactEditor.setEditorView(mUI.getEditorView());
 
         PaymentRequestMetrics.recordRequestedInformationHistogram(requestPayerEmail,
                 requestPayerPhone, requestShipping, requestPayerName);
     }
@@ skipping 394 matching lines @@
         mAddressEditor.edit(toEdit, new Callback<AutofillAddress>() {
             @Override
             public void onResult(AutofillAddress completeAddress) {
                 if (mUI == null) return;
 
                 if (completeAddress == null) {
                     mShippingAddressesSection.setSelectedItemIndex(SectionInformation.NO_SELECTION);
                     providePaymentInformation();
                 } else {
                     // Set the shipping address label.
-                    completeAddress.setShippingAddressLabel();
+                    completeAddress.setShippingAddressLabelWithCountry();
 
                     if (toEdit == null) mShippingAddressesSection.addAndSelectItem(completeAddress);
                     mCardEditor.updateBillingAddressIfComplete(completeAddress);
                     mClient.onShippingAddressChange(completeAddress.toPaymentAddress());
                 }
             }
         });
     }
 
     private void editContact(final AutofillContact toEdit) {
@@ skipping 341 matching lines @@
     /**
      * Called if unable to retrieve instrument details.
      */
     @Override
     public void onInstrumentDetailsError() {
         if (mClient == null) return;
         mUI.onPayButtonProcessingCancelled();
         mPaymentAppRunning = false;
     }
 
+    @Override
+    public void onFocusChanged(
+            @PaymentRequestUI.DataType int dataType, boolean willFocus) {
+        assert dataType == PaymentRequestUI.TYPE_SHIPPING_ADDRESSES;
+
+        if (mShippingAddressesSection.getSelectedItem() == null) return;
+
+        assert mShippingAddressesSection.getSelectedItem() instanceof AutofillAddress;
+        AutofillAddress selectedAddress =
+                (AutofillAddress) mShippingAddressesSection.getSelectedItem();
+
+        // The label should only include the country if the view is focused.
+        if (willFocus) {
+            selectedAddress.setShippingAddressLabelWithCountry();
+        } else {
+            selectedAddress.setShippingAddressLabelWithoutCountry();
+        }
+
+        mUI.updateSection(PaymentRequestUI.TYPE_SHIPPING_ADDRESSES, mShippingAddressesSection);
+    }
+
     /**
      * Closes the UI. If the client is still connected, then it's notified of UI hiding.
      *
      * @param immediateClose If true, then UI immediately closes. If false, the UI shows the error
      *                       message "There was an error processing your order." This message
      *                       implies that the merchant attempted to process the order, failed, and
      *                       called complete("fail") to notify the user. Therefore, this parameter
      *                       may be "false" only when called from
      *                       {@link PaymentRequestImpl#complete(int)}. All other callers should
      *                       always pass "true."
@@ skipping 67 matching lines @@
                 "PaymentRequest.CheckoutFunnel.Aborted", abortReason,
                 PaymentRequestMetrics.ABORT_REASON_MAX);
 
         if (abortReason == PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER) {
             mJourneyLogger.recordJourneyStatsHistograms("UserAborted");
         } else {
             mJourneyLogger.recordJourneyStatsHistograms("OtherAborted");
         }
     }
 }