| 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 | 3 |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 | 7 |
| 8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
| 10 android:layout_height="wrap_content" | 10 android:layout_height="wrap_content" |
| 11 android:gravity="center_vertical" | 11 android:gravity="center_vertical" |
| 12 android:orientation="horizontal" > | 12 android:orientation="horizontal" > |
| 13 | 13 |
| 14 <!-- These layout params are overwritten in DropdownAdapter.java --> | 14 <!-- These layout params are overwritten in DropdownAdapter.java --> |
| 15 | 15 |
| 16 <ImageView |
| 17 android:id="@+id/start_dropdown_icon" |
| 18 android:layout_width="wrap_content" |
| 19 android:layout_height="wrap_content" |
| 20 android:layout_margin="8dp" |
| 21 android:contentDescription="@null" /> |
| 22 |
| 16 <LinearLayout | 23 <LinearLayout |
| 17 android:id="@+id/dropdown_label_wrapper" | 24 android:id="@+id/dropdown_label_wrapper" |
| 18 android:layout_width="0dp" | 25 android:layout_width="0dp" |
| 19 android:layout_height="0dp" | 26 android:layout_height="0dp" |
| 20 android:layout_weight="1" | 27 android:layout_weight="1" |
| 21 android:gravity="center_vertical" | 28 android:gravity="center_vertical" |
| 22 android:orientation="vertical" > | 29 android:orientation="vertical" > |
| 23 | 30 |
| 24 <TextView | 31 <TextView |
| 25 android:id="@+id/dropdown_label" | 32 android:id="@+id/dropdown_label" |
| 26 android:layout_width="wrap_content" | 33 android:layout_width="wrap_content" |
| 27 android:layout_height="wrap_content" | 34 android:layout_height="wrap_content" |
| 28 android:layout_marginEnd="10dp" | 35 android:layout_marginEnd="@dimen/dropdown_item_label_margin" |
| 29 android:layout_marginStart="10dp" | 36 android:layout_marginStart="@dimen/dropdown_item_label_margin" |
| 30 android:ellipsize="end" | 37 android:ellipsize="end" |
| 31 android:includeFontPadding="false" | 38 android:includeFontPadding="false" |
| 32 android:singleLine="true" | 39 android:singleLine="true" |
| 33 android:textAlignment="viewStart" | 40 android:textAlignment="viewStart" |
| 34 android:textColor="@drawable/dropdown_label_color" | 41 android:textColor="@drawable/dropdown_label_color" |
| 35 android:textSize="@dimen/dropdown_item_label_font_size" /> | 42 android:textSize="@dimen/dropdown_item_label_font_size" /> |
| 36 | 43 |
| 37 <TextView | 44 <TextView |
| 38 android:id="@+id/dropdown_sublabel" | 45 android:id="@+id/dropdown_sublabel" |
| 39 android:layout_width="wrap_content" | 46 android:layout_width="wrap_content" |
| 40 android:layout_height="wrap_content" | 47 android:layout_height="wrap_content" |
| 41 android:layout_marginEnd="10dp" | 48 android:layout_marginEnd="10dp" |
| 42 android:layout_marginStart="10dp" | 49 android:layout_marginStart="10dp" |
| 43 android:ellipsize="end" | 50 android:ellipsize="end" |
| 44 android:includeFontPadding="false" | 51 android:includeFontPadding="false" |
| 45 android:singleLine="true" | 52 android:singleLine="true" |
| 46 android:textAlignment="viewStart" | 53 android:textAlignment="viewStart" |
| 47 android:textColor="#646464" | 54 android:textColor="#646464" |
| 48 android:textSize="14sp" /> | 55 android:textSize="14sp" /> |
| 49 </LinearLayout> | 56 </LinearLayout> |
| 50 | 57 |
| 51 <ImageView | 58 <ImageView |
| 52 android:id="@+id/dropdown_icon" | 59 android:id="@+id/end_dropdown_icon" |
| 53 android:layout_width="wrap_content" | 60 android:layout_width="wrap_content" |
| 54 android:layout_height="wrap_content" | 61 android:layout_height="wrap_content" |
| 55 android:layout_margin="8dp" | 62 android:layout_margin="8dp" |
| 56 android:contentDescription="@null" /> | 63 android:contentDescription="@null" /> |
| 57 | 64 |
| 58 </LinearLayout> | 65 </LinearLayout> |
| OLD | NEW |