|
|
Chromium Code Reviews|
Created:
3 years, 10 months ago by gogerald1 Modified:
3 years, 10 months ago Reviewers:
please use gerrit instead CC:
chromium-reviews, rouslan+payments_chromium.org, sebsg+paymentswatch_chromium.org, gogerald+paymentswatch_chromium.org, agrieve+watch_chromium.org Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionRename mIsShowingEditDialog to mIsExpandedToFullHeight
BUG=687312
Review-Url: https://codereview.chromium.org/2678003004
Cr-Commit-Position: refs/heads/master@{#448388}
Committed: https://chromium.googlesource.com/chromium/src/+/07a62cb56b08816606acc1db1f7c73002aad62ba
Patch Set 1 #Patch Set 2 : rebase #Messages
Total messages: 22 (14 generated)
Description was changed from ========== rename mIsShowingEditDialog BUG= ========== to ========== Rename mIsShowingEditDialog to mIsExpandedToFullHeight BUG=687312 ==========
The CQ bit was checked by gogerald@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
gogerald@chromium.org changed reviewers: + rouslan@chromium.org
Hi rouslan@, PTAL,
lgtm
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
The CQ bit was checked by gogerald@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java:
While running git apply --index -p1;
error: patch failed:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java:934
error:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java:
patch does not apply
Patch:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
Index:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
diff --git
a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
index
3be76de87447105a7fa4aac276b5404e4e0f2786..15b1e56412428ca1b57b9ff6a2d0528a79c1f5bd
100644
---
a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
+++
b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
@@ -327,7 +327,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
private List<SectionSeparator> mSectionSeparators;
private PaymentRequestSection mSelectedSection;
- private boolean mIsShowingEditDialog;
+ private boolean mIsExpandedToFullHeight;
private boolean mIsProcessingPayClicked;
private boolean mIsClientClosing;
private boolean mIsClientCheckingSelection;
@@ -834,7 +834,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
} else if (v == mPayButton) {
processPayButton();
} else if (v == mEditButton) {
- if (mIsShowingEditDialog) {
+ if (mIsExpandedToFullHeight) {
dismissDialog(true);
} else {
expand(mOrderSummarySection);
@@ -934,7 +934,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
mButtonBar.setVisibility(View.VISIBLE);
mSpinnyLayout.setVisibility(View.GONE);
- if (mIsShowingEditDialog) {
+ if (mIsExpandedToFullHeight) {
((FrameLayout.LayoutParams)
mRequestView.getLayoutParams()).height =
LayoutParams.MATCH_PARENT;
mRequestView.requestLayout();
@@ -984,7 +984,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
}
private void expand(PaymentRequestSection section) {
- if (!mIsShowingEditDialog) {
+ if (!mIsExpandedToFullHeight) {
// Container now takes the full height of the screen, animating
towards it.
mRequestView.getLayoutParams().height = LayoutParams.MATCH_PARENT;
mRequestView.addOnLayoutChangeListener(new
SheetEnlargingAnimator(true));
@@ -1033,7 +1033,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
false /* leftIsSingleLine */, null /* rightTruncate */,
false /* rightIsSingleLine */);
- mIsShowingEditDialog = true;
+ mIsExpandedToFullHeight = true;
}
// Update the section contents when they're selected.
The CQ bit was checked by gogerald@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java:
While running git apply --index -p1;
error: patch failed:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java:934
error:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java:
patch does not apply
Patch:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
Index:
chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
diff --git
a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
index
3be76de87447105a7fa4aac276b5404e4e0f2786..15b1e56412428ca1b57b9ff6a2d0528a79c1f5bd
100644
---
a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
+++
b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
@@ -327,7 +327,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
private List<SectionSeparator> mSectionSeparators;
private PaymentRequestSection mSelectedSection;
- private boolean mIsShowingEditDialog;
+ private boolean mIsExpandedToFullHeight;
private boolean mIsProcessingPayClicked;
private boolean mIsClientClosing;
private boolean mIsClientCheckingSelection;
@@ -834,7 +834,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
} else if (v == mPayButton) {
processPayButton();
} else if (v == mEditButton) {
- if (mIsShowingEditDialog) {
+ if (mIsExpandedToFullHeight) {
dismissDialog(true);
} else {
expand(mOrderSummarySection);
@@ -934,7 +934,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
mButtonBar.setVisibility(View.VISIBLE);
mSpinnyLayout.setVisibility(View.GONE);
- if (mIsShowingEditDialog) {
+ if (mIsExpandedToFullHeight) {
((FrameLayout.LayoutParams)
mRequestView.getLayoutParams()).height =
LayoutParams.MATCH_PARENT;
mRequestView.requestLayout();
@@ -984,7 +984,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
}
private void expand(PaymentRequestSection section) {
- if (!mIsShowingEditDialog) {
+ if (!mIsExpandedToFullHeight) {
// Container now takes the full height of the screen, animating
towards it.
mRequestView.getLayoutParams().height = LayoutParams.MATCH_PARENT;
mRequestView.addOnLayoutChangeListener(new
SheetEnlargingAnimator(true));
@@ -1033,7 +1033,7 @@ public class PaymentRequestUI implements
DialogInterface.OnDismissListener, View
false /* leftIsSingleLine */, null /* rightTruncate */,
false /* rightIsSingleLine */);
- mIsShowingEditDialog = true;
+ mIsExpandedToFullHeight = true;
}
// Update the section contents when they're selected.
The CQ bit was checked by gogerald@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from rouslan@chromium.org Link to the patchset: https://codereview.chromium.org/2678003004/#ps20001 (title: "rebase")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
CQ is committing da patch.
Bot data: {"patchset_id": 20001, "attempt_start_ts": 1486413408051170,
"parent_rev": "ee2c2fb24cec1241e84612fa9e104c626e75f565", "commit_rev":
"07a62cb56b08816606acc1db1f7c73002aad62ba"}
Message was sent while issue was closed.
Description was changed from ========== Rename mIsShowingEditDialog to mIsExpandedToFullHeight BUG=687312 ========== to ========== Rename mIsShowingEditDialog to mIsExpandedToFullHeight BUG=687312 Review-Url: https://codereview.chromium.org/2678003004 Cr-Commit-Position: refs/heads/master@{#448388} Committed: https://chromium.googlesource.com/chromium/src/+/07a62cb56b08816606acc1db1f7c... ==========
Message was sent while issue was closed.
Committed patchset #2 (id:20001) as https://chromium.googlesource.com/chromium/src/+/07a62cb56b08816606acc1db1f7c... |
