| 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 <!-- Indeterminate spinny used to show that things are being loaded in the Payme
ntRequestUi. | 6 <!-- Indeterminate spinny used to show that things are being loaded in the Payme
ntRequestUi. |
| 7 Margins in this file are assigned so that it can be either included or infl
ated and have | 7 Margins in this file are assigned so that it can be either included or infl
ated and have |
| 8 the correct margins for the situation. When included in the main bottom sh
eet, the | 8 the correct margins for the situation. When included in the main bottom sh
eet, the |
| 9 FrameLayout's margins are applied, but they are ignored when this is inflat
ed without | 9 FrameLayout's margins are applied, but they are ignored when this is inflat
ed without |
| 10 a parent. | 10 a parent. |
| 11 --> | 11 --> |
| 12 <FrameLayout | 12 <FrameLayout |
| 13 xmlns:android="http://schemas.android.com/apk/res/android" | 13 xmlns:android="http://schemas.android.com/apk/res/android" |
| 14 xmlns:tools="http://schemas.android.com/tools" |
| 15 tools:ignore="MergeRootFrame" |
| 14 android:id="@+id/payment_request_spinny" | 16 android:id="@+id/payment_request_spinny" |
| 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:layout_marginBottom="@dimen/payments_section_large_spacing" > | 19 android:layout_marginBottom="@dimen/payments_section_large_spacing" > |
| 18 | 20 |
| 19 <!-- Indeterminate spinny to show that things are processing. --> | 21 <!-- Indeterminate spinny to show that things are processing. --> |
| 20 <ProgressBar | 22 <ProgressBar |
| 21 android:id="@+id/waiting_progress" | 23 android:id="@+id/waiting_progress" |
| 22 android:layout_width="24dp" | 24 android:layout_width="24dp" |
| 23 android:layout_height="24dp" | 25 android:layout_height="24dp" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 35 android:layout_gravity="center_horizontal" | 37 android:layout_gravity="center_horizontal" |
| 36 android:layout_marginTop="80dp" | 38 android:layout_marginTop="80dp" |
| 37 android:layout_marginStart="@dimen/payments_section_large_spacing" | 39 android:layout_marginStart="@dimen/payments_section_large_spacing" |
| 38 android:layout_marginEnd="@dimen/payments_section_large_spacing" | 40 android:layout_marginEnd="@dimen/payments_section_large_spacing" |
| 39 android:layout_marginBottom="@dimen/payments_section_large_spacing" | 41 android:layout_marginBottom="@dimen/payments_section_large_spacing" |
| 40 android:gravity="center_horizontal" | 42 android:gravity="center_horizontal" |
| 41 android:textColor="@color/descriptive_text_color" | 43 android:textColor="@color/descriptive_text_color" |
| 42 android:textSize="16sp" /> | 44 android:textSize="16sp" /> |
| 43 | 45 |
| 44 </FrameLayout> | 46 </FrameLayout> |
| OLD | NEW |