Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <!-- PaymentRequestUI dialog | 6 <!-- PaymentRequestUI dialog |
| 7 Sits at the bottom of the screen like a Bottom Sheet. | 7 Sits at the bottom of the screen like a Bottom Sheet. |
| 8 --> | 8 --> |
| 9 <org.chromium.chrome.browser.widget.BoundedLinearLayout | 9 <org.chromium.chrome.browser.widget.BoundedLinearLayout |
| 10 xmlns:android="http://schemas.android.com/apk/res/android" | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 android:visibility="gone" > | 25 android:visibility="gone" > |
| 26 | 26 |
| 27 <LinearLayout | 27 <LinearLayout |
| 28 android:id="@+id/payment_container_layout" | 28 android:id="@+id/payment_container_layout" |
| 29 android:layout_width="match_parent" | 29 android:layout_width="match_parent" |
| 30 android:layout_height="wrap_content" | 30 android:layout_height="wrap_content" |
| 31 android:orientation="vertical" /> | 31 android:orientation="vertical" /> |
| 32 | 32 |
| 33 </org.chromium.chrome.browser.payments.ui.FadingEdgeScrollView> | 33 </org.chromium.chrome.browser.payments.ui.FadingEdgeScrollView> |
| 34 | 34 |
| 35 <org.chromium.chrome.browser.widget.DualControlLayout | 35 <LinearLayout |
|
gone
2017/02/16 19:18:56
Doing this means that the buttons will never stack
gogerald1
2017/02/17 00:44:45
Yes, to avoid another level of viewgroup. We have
| |
| 36 android:id="@+id/button_bar" | 36 android:id="@+id/bottom_bar" |
| 37 android:layout_height="wrap_content" | 37 android:layout_height="wrap_content" |
| 38 android:layout_width="match_parent" | 38 android:layout_width="match_parent" |
| 39 android:padding="@dimen/payments_section_large_spacing" | 39 android:padding="@dimen/payments_section_large_spacing" |
| 40 android:background="@android:color/white" | 40 android:background="@android:color/white" |
| 41 android:visibility="gone" /> | 41 android:visibility="gone" > |
| 42 | |
| 43 <ImageView | |
| 44 android:layout_width="72dp" | |
| 45 android:layout_height="20dp" | |
| 46 android:layout_gravity="center_vertical" | |
| 47 android:src="@drawable/product_logo_name" | |
| 48 android:contentDescription="@null" /> | |
| 49 | |
| 50 <Space | |
| 51 android:layout_width="0dp" | |
| 52 android:layout_height="0dp" | |
| 53 android:layout_weight="1" | |
| 54 android:visibility="invisible"/> | |
|
gone
2017/02/16 19:18:56
1) Might as well just keep this visible. It doesn
gogerald1
2017/02/17 00:44:45
Done.
| |
| 55 | |
| 56 <Button | |
| 57 android:id="@+id/edit_button" | |
| 58 style="@style/ButtonCompatBorderless" | |
| 59 android:layout_width="wrap_content" | |
| 60 android:layout_height="36dp" | |
| 61 android:text="@string/payments_edit_button" | |
| 62 android:textAllCaps="true" | |
| 63 android:textColor="@color/light_active_color" | |
| 64 android:textSize="14sp" /> | |
| 65 | |
| 66 <org.chromium.ui.widget.ButtonCompat | |
| 67 android:id="@+id/pay_button" | |
| 68 android:layout_width="wrap_content" | |
| 69 android:layout_height="36dp" | |
| 70 android:text="@string/payments_pay_button" | |
| 71 android:textAllCaps="true" | |
| 72 android:textColor="@android:color/white" | |
| 73 android:textSize="14sp" | |
| 74 chrome:buttonColor="@color/light_active_color" | |
| 75 chrome:buttonRaised="false"/> | |
| 76 </LinearLayout> | |
| 42 | 77 |
| 43 </org.chromium.chrome.browser.widget.BoundedLinearLayout> | 78 </org.chromium.chrome.browser.widget.BoundedLinearLayout> |
| OLD | NEW |