| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2014 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2014 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 <!-- EditText views in FloatLabelLayout require both hint and contentDescription
to be set | 6 <!-- EditText views in FloatLabelLayout require both hint and contentDescription
to be set |
| 7 to work correctly for accessibility because FloatLabelLayout sometimes clea
r hint. --> | 7 to work correctly for accessibility because FloatLabelLayout sometimes clea
r hint. --> |
| 8 <!--suppress ContentDescription --> | 8 <!--suppress ContentDescription --> |
| 9 <merge | 9 <merge |
| 10 xmlns:android="http://schemas.android.com/apk/res/android" | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 <View style="@style/PreferenceSpinnerUnderlineView" /> | 32 <View style="@style/PreferenceSpinnerUnderlineView" /> |
| 33 </LinearLayout> | 33 </LinearLayout> |
| 34 | 34 |
| 35 <LinearLayout | 35 <LinearLayout |
| 36 android:id="@+id/autofill_profile_widget_root" | 36 android:id="@+id/autofill_profile_widget_root" |
| 37 android:layout_width="match_parent" | 37 android:layout_width="match_parent" |
| 38 android:layout_height="wrap_content" | 38 android:layout_height="wrap_content" |
| 39 android:orientation="vertical" > | 39 android:orientation="vertical" > |
| 40 </LinearLayout> | 40 </LinearLayout> |
| 41 | 41 |
| 42 <org.chromium.chrome.browser.widget.FloatLabelLayout | 42 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout |
| 43 android:id="@+id/phone_number_label" | 43 android:id="@+id/phone_number_label" |
| 44 android:layout_width="match_parent" | 44 android:layout_width="match_parent" |
| 45 android:layout_height="wrap_content" > | 45 android:layout_height="wrap_content" > |
| 46 <EditText | 46 <EditText |
| 47 android:id="@+id/phone_number_edit" | 47 android:id="@+id/phone_number_edit" |
| 48 android:layout_width="match_parent" | 48 android:layout_width="match_parent" |
| 49 android:layout_height="wrap_content" | 49 android:layout_height="wrap_content" |
| 50 android:imeOptions="flagNoExtractUi" | 50 android:imeOptions="flagNoExtractUi" |
| 51 android:inputType="phone" | 51 android:inputType="phone" |
| 52 android:singleLine="true" | 52 android:singleLine="true" |
| 53 android:hint="@string/autofill_profile_editor_phone_number" /> | 53 android:hint="@string/autofill_profile_editor_phone_number" /> |
| 54 </org.chromium.chrome.browser.widget.FloatLabelLayout> | 54 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> |
| 55 | 55 |
| 56 <org.chromium.chrome.browser.widget.FloatLabelLayout | 56 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout |
| 57 android:id="@+id/email_address_label" | 57 android:id="@+id/email_address_label" |
| 58 android:layout_width="match_parent" | 58 android:layout_width="match_parent" |
| 59 android:layout_height="wrap_content" > | 59 android:layout_height="wrap_content" > |
| 60 <EditText | 60 <EditText |
| 61 android:id="@+id/email_address_edit" | 61 android:id="@+id/email_address_edit" |
| 62 android:layout_width="match_parent" | 62 android:layout_width="match_parent" |
| 63 android:layout_height="wrap_content" | 63 android:layout_height="wrap_content" |
| 64 android:imeOptions="flagNoExtractUi" | 64 android:imeOptions="flagNoExtractUi" |
| 65 android:inputType="textEmailAddress" | 65 android:inputType="textEmailAddress" |
| 66 android:singleLine="true" | 66 android:singleLine="true" |
| 67 android:hint="@string/autofill_profile_editor_email_address" /> | 67 android:hint="@string/autofill_profile_editor_email_address" /> |
| 68 </org.chromium.chrome.browser.widget.FloatLabelLayout> | 68 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> |
| 69 | 69 |
| 70 </merge> | 70 </merge> |
| OLD | NEW |