| OLD | NEW |
| (Empty) |
| 1 <?xml version="1.0" encoding="utf-8"?> | |
| 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 | |
| 4 found in the LICENSE file. | |
| 5 --> | |
| 6 <merge xmlns:android="http://schemas.android.com/apk/res/android" | |
| 7 android:layout_width="wrap_content" | |
| 8 android:layout_height="wrap_content"> | |
| 9 <ProgressBar | |
| 10 android:id="@+id/submit_spinner" | |
| 11 android:layout_width="20dp" | |
| 12 android:layout_height="20dp" | |
| 13 android:layout_centerHorizontal="true" | |
| 14 android:layout_marginBottom="22dp" | |
| 15 android:indeterminate="true" | |
| 16 android:visibility="invisible" /> | |
| 17 | |
| 18 <Button | |
| 19 android:id="@+id/btn_cancel" | |
| 20 android:layout_width="73dp" | |
| 21 android:layout_height="36dp" | |
| 22 android:layout_marginEnd="10dp" | |
| 23 android:layout_toStartOf="@+id/btn_ok" | |
| 24 android:background="@null" | |
| 25 android:fontFamily="sans-serif-medium" | |
| 26 android:text="@string/blimp_form_input_cancel" | |
| 27 android:textColor="@color/btn_text_color" | |
| 28 android:textSize="14sp" /> | |
| 29 | |
| 30 <Button | |
| 31 android:id="@+id/btn_ok" | |
| 32 android:layout_width="37dp" | |
| 33 android:layout_height="36dp" | |
| 34 android:layout_alignParentEnd="true" | |
| 35 android:layout_marginEnd="14dp" | |
| 36 android:background="@null" | |
| 37 android:fontFamily="sans-serif-medium" | |
| 38 android:text="@string/blimp_form_input_ok" | |
| 39 android:textColor="@color/btn_text_color" | |
| 40 android:textSize="14sp" /> | |
| 41 </merge> | |
| OLD | NEW |