test

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;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Handler;
 import android.support.annotation.IntDef;
 import android.support.v4.view.animation.FastOutLinearInInterpolator;
 import android.support.v4.view.animation.LinearOutSlowInInterpolator;
 import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.TextUtils.TruncateAt;
 import android.text.method.LinkMovementMethod;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.payments.ShippingStrings;
-import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.ExtraTextsSection;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.LineItemBreakdownSection;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSection;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.SectionSeparator;
+import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.ShippingSummarySection;
 import org.chromium.chrome.browser.widget.AlwaysDismissedDialog;
 import org.chromium.chrome.browser.widget.animation.AnimatorProperties;
 import org.chromium.chrome.browser.widget.animation.FocusAnimator;
 import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;
 import org.chromium.ui.widget.TextViewWithClickableSpans;
 
 import java.lang.annotation.Retention;
@@ skipping 253 matching lines @@
 
     private ScrollView mPaymentContainer;
     private LinearLayout mPaymentContainerLayout;
     private ViewGroup mBottomBar;
     private Button mEditButton;
     private Button mPayButton;
     private View mCloseButton;
     private View mSpinnyLayout;
 
     private LineItemBreakdownSection mOrderSummarySection;
-    private ExtraTextsSection mShippingSummarySection;
+    private ShippingSummarySection mShippingSummarySection;
     private OptionSection mShippingAddressSection;
     private OptionSection mShippingOptionSection;
     private OptionSection mContactDetailsSection;
     private OptionSection mPaymentMethodSection;
     private List<SectionSeparator> mSectionSeparators;
 
     private PaymentRequestSection mSelectedSection;
     private boolean mIsExpandedToFullHeight;
     private boolean mIsProcessingPayClicked;
     private boolean mIsClientClosing;
@@ skipping 120 matching lines @@
         mDialog.show();
         mClient.getDefaultPaymentInformation(new Callback<PaymentInformation>() {
             @Override
             public void onResult(PaymentInformation result) {
                 updateOrderSummarySection(result.getShoppingCart());
 
                 if (mRequestShipping) {
                     updateSection(TYPE_SHIPPING_ADDRESSES, result.getShippingAddresses());
                     updateSection(TYPE_SHIPPING_OPTIONS, result.getShippingOptions());
 
-                    String selectedShippingName = result.getSelectedShippingAddressLabel();
-                    String selectedShippingAddress = result.getSelectedShippingAddressSublabel();
-                    String selectedShippingPhone = result.getSelectedShippingAddressTertiaryLabel();
-                    String selectedShippingOptionLabel = result.getSelectedShippingOptionLabel();
+                    mShippingSummarySection.update(new ShippingSummaryInformation(
+                            result.getShippingAddresses(), result.getShippingOptions()));
 
-                    if (selectedShippingAddress == null || selectedShippingOptionLabel == null) {
-                        // Let the summary display a SELECT/ADD button for the first subsection
-                        // that needs it.
-                        mShippingSummarySection.setSummaryText(null, null);
-                        mShippingSummarySection.setSummaryProperties(null /* leftTruncate */,
-                                false /* leftIsSingleLine */, null /* rightTruncate */,
-                                false /* rightIsSingleLine */);
-
-                        PaymentRequestSection section =
-                                mShippingAddressSection.getEditButtonState() == EDIT_BUTTON_GONE
-                                        ? mShippingOptionSection : mShippingAddressSection;
-                        mShippingSummarySection.setEditButtonState(section.getEditButtonState());
-                    } else {
-                        // Show the shipping name in the summary section.
-                        mShippingSummarySection.setSummaryText(selectedShippingName, null);
-                        mShippingSummarySection.setSummaryProperties(TruncateAt.END,
-                                true /* leftIsSingleLine */, null /* rightTruncate */,
-                                false /* rightIsSingleLine */);
-
-                        // Show the shipping address, phone and option below the summary.
-                        mShippingSummarySection.setExtraTexts(new String[] {selectedShippingAddress,
-                                selectedShippingPhone, selectedShippingOptionLabel});
-                        mShippingSummarySection.setExtraTextsProperties(
-                                new TruncateAt[] {
-                                        TruncateAt.MIDDLE, TruncateAt.END, TruncateAt.END},
-                                new boolean[] {true, true, true});
-                    }
+                    // Let the summary display a CHOOSE/ADD button for the first subsection that
+                    // needs it.
+                    PaymentRequestSection section =
+                            mShippingAddressSection.getEditButtonState() == EDIT_BUTTON_GONE
+                            ? mShippingOptionSection
+                            : mShippingAddressSection;
+                    mShippingSummarySection.setEditButtonState(section.getEditButtonState());
                 }
 
                 if (mRequestContactDetails) {
-                    // Sets the summary of the contact displays in a single line.
-                    mContactDetailsSection.setSummaryProperties(TruncateAt.END,
-                            true /* leftIsSingleLine */, null /* rightTruncate */,
-                            false /* rightIsSingleLine */);
                     updateSection(TYPE_CONTACT_DETAILS, result.getContactDetails());
                 }
 
-                // Sets the summary of the payment method displays in a single line.
-                mPaymentMethodSection.setSummaryProperties(TruncateAt.END,
-                        true /* leftIsSingleLine */, null /* rightTruncate */,
-                        false /* rightIsSingleLine */);
                 updateSection(TYPE_PAYMENT_METHODS, result.getPaymentMethods());
                 updatePayButtonEnabled();
 
                 // Hide the loading indicators and show the real sections.
                 changeSpinnerVisibility(false);
                 mRequestView.addOnLayoutChangeListener(new SheetEnlargingAnimator(false));
             }
         });
     }
 
@@ skipping 31 matching lines @@
         mEditButton.setOnClickListener(this);
 
         // Create all the possible sections.
         mSectionSeparators = new ArrayList<>();
         mPaymentContainer = (ScrollView) mRequestView.findViewById(R.id.option_container);
         mPaymentContainerLayout =
                 (LinearLayout) mRequestView.findViewById(R.id.payment_container_layout);
         mOrderSummarySection = new LineItemBreakdownSection(context,
                 context.getString(R.string.payments_order_summary_label), this,
                 context.getString(R.string.payments_updated_label));
-        mShippingSummarySection = new ExtraTextsSection(
+        mShippingSummarySection = new ShippingSummarySection(
                 context, context.getString(mShippingStrings.getSummaryLabel()), this);
         mShippingAddressSection = new OptionSection(
                 context, context.getString(mShippingStrings.getAddressLabel()), this);
         mShippingOptionSection = new OptionSection(
                 context, context.getString(mShippingStrings.getOptionLabel()), this);
         mContactDetailsSection = new OptionSection(
                 context, context.getString(R.string.payments_contact_details_label), this);
         mPaymentMethodSection = new OptionSection(
                 context, context.getString(R.string.payments_method_of_payment_label), this);
 
@@ skipping 443 matching lines @@
             // Switch the 'edit' button to a 'cancel' button.
             mEditButton.setText(mContext.getString(R.string.cancel));
 
             // Make the dialog take the whole screen.
             mDialog.getWindow().setLayout(
                     ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
 
             // Disable all but the first button.
             updateSectionButtons();
 
-            // Sets the summary of the payment method and contact displays in multiple lines.
-            mContactDetailsSection.setSummaryProperties(null /* leftTruncate */,
-                    false /* leftIsSingleLine */, null /* rightTruncate */,
-                    false /* rightIsSingleLine */);
-            mPaymentMethodSection.setSummaryProperties(null /* leftTruncate */,
-                    false /* leftIsSingleLine */, null /* rightTruncate */,
-                    false /* rightIsSingleLine */);
-
             mIsExpandedToFullHeight = true;
         }
 
         // Update the section contents when they're selected.
         mSelectedSection = section;
         assert mSelectedSection != mShippingSummarySection;
         if (mSelectedSection == mOrderSummarySection) {
             mClient.getShoppingCart(new Callback<ShoppingCart>() {
                 @Override
                 public void onResult(ShoppingCart result) {
@@ skipping 364 matching lines @@
             sObserverForTest.onPaymentRequestReadyForInput(this);
         }
     }
 
     private void notifySelectionChecked() {
         if (sObserverForTest != null) {
             sObserverForTest.onPaymentRequestSelectionChecked(this);
         }
     }
 }