| 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 <merge | 6 <merge |
| 7 xmlns:android="http://schemas.android.com/apk/res/android" | 7 xmlns:android="http://schemas.android.com/apk/res/android" |
| 8 xmlns:app="http://schemas.android.com/apk/res-auto" > | 8 xmlns:app="http://schemas.android.com/apk/res-auto" > |
| 9 | 9 |
| 10 <Space style="@style/ButtonBarTopSpacerLight" /> | 10 <Space style="@style/ButtonBarTopSpacerLight" /> |
| 11 | 11 |
| 12 <!-- CANCEL and SAVE buttons. --> | 12 <!-- CANCEL and SAVE buttons. |
| 13 paddingEnd is already handled by the ScrollView parent. |
| 14 --> |
| 13 <org.chromium.chrome.browser.widget.DualControlLayout | 15 <org.chromium.chrome.browser.widget.DualControlLayout |
| 14 android:id="@+id/button_bar" | 16 android:id="@+id/button_bar" |
| 15 android:layout_width="match_parent" | 17 android:layout_width="match_parent" |
| 16 android:layout_height="wrap_content" | 18 android:layout_height="wrap_content" |
| 17 android:padding="@dimen/payments_section_large_spacing" | 19 android:paddingStart="@dimen/payments_section_large_spacing" |
| 20 android:paddingTop="@dimen/payments_section_large_spacing" |
| 21 android:paddingBottom="@dimen/payments_section_large_spacing" |
| 18 android:background="@android:color/white" | 22 android:background="@android:color/white" |
| 19 app:stackedMargin="@dimen/infobar_margin_between_stacked_buttons" | 23 app:stackedMargin="@dimen/infobar_margin_between_stacked_buttons" |
| 20 app:primaryButtonText="@string/save" | 24 app:primaryButtonText="@string/save" |
| 21 app:secondaryButtonText="@string/cancel" /> | 25 app:secondaryButtonText="@string/cancel" /> |
| 22 | 26 |
| 23 </merge> | 27 </merge> |
| OLD | NEW |