OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- | 2 <!-- |
3 Copyright 2017 The Chromium Authors. All rights reserved. | 3 Copyright 2017 The Chromium Authors. All rights reserved. |
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 <!-- Represents a single item in the Photo Picker. --> | 8 <!-- Represents a single item in the Photo Picker. --> |
9 | 9 |
10 <view class="org.chromium.chrome.browser.photo_picker.PickerBitmapView" | 10 <view class="org.chromium.chrome.browser.photo_picker.PickerBitmapView" |
11 xmlns:android="http://schemas.android.com/apk/res/android" | 11 xmlns:android="http://schemas.android.com/apk/res/android" |
| 12 xmlns:app="http://schemas.android.com/apk/res-auto" |
12 android:layout_width="wrap_content" | 13 android:layout_width="wrap_content" |
13 android:layout_height="wrap_content"> | 14 android:layout_height="wrap_content"> |
14 | 15 |
15 <FrameLayout | 16 <FrameLayout |
16 android:id="@+id/border" | 17 android:id="@+id/border" |
17 android:layout_width="wrap_content" | 18 android:layout_width="wrap_content" |
18 android:layout_height="wrap_content" | 19 android:layout_height="wrap_content" |
19 android:layout_gravity="center"> | 20 android:layout_gravity="center"> |
20 | 21 |
21 <ImageView | 22 <ImageView |
(...skipping 10 matching lines...) Expand all Loading... |
32 android:contentDescription="@null" | 33 android:contentDescription="@null" |
33 android:visibility="gone" /> | 34 android:visibility="gone" /> |
34 </FrameLayout> | 35 </FrameLayout> |
35 | 36 |
36 <ImageView | 37 <ImageView |
37 android:id="@+id/selected" | 38 android:id="@+id/selected" |
38 android:layout_width="26dp" | 39 android:layout_width="26dp" |
39 android:layout_height="26dp" | 40 android:layout_height="26dp" |
40 android:layout_marginStart="2dp" | 41 android:layout_marginStart="2dp" |
41 android:layout_marginTop="2dp" | 42 android:layout_marginTop="2dp" |
42 android:background="@drawable/checkmark_blue" | |
43 android:contentDescription="@null" | 43 android:contentDescription="@null" |
44 android:visibility="gone" /> | 44 android:visibility="gone" |
| 45 app:srcCompat="@drawable/checkmark_blue" /> |
45 | 46 |
46 <ImageView | 47 <ImageView |
47 android:id="@+id/unselected" | 48 android:id="@+id/unselected" |
48 android:layout_width="22dp" | 49 android:layout_width="22dp" |
49 android:layout_height="22dp" | 50 android:layout_height="22dp" |
50 android:layout_marginStart="4dp" | 51 android:layout_marginStart="4dp" |
51 android:layout_marginTop="4dp" | 52 android:layout_marginTop="4dp" |
52 android:background="@drawable/circle_white" | 53 android:background="@drawable/circle_white" |
53 android:contentDescription="@null" | 54 android:contentDescription="@null" |
54 android:visibility="gone" /> | 55 android:visibility="gone" /> |
(...skipping 22 matching lines...) Expand all Loading... |
77 android:layout_height="wrap_content" | 78 android:layout_height="wrap_content" |
78 android:layout_marginTop="@dimen/photo_picker_label_gap" | 79 android:layout_marginTop="@dimen/photo_picker_label_gap" |
79 android:fontFamily="sans-serif-medium" | 80 android:fontFamily="sans-serif-medium" |
80 android:gravity="center" | 81 android:gravity="center" |
81 android:textStyle="bold" | 82 android:textStyle="bold" |
82 android:textSize="14sp" | 83 android:textSize="14sp" |
83 android:textAllCaps="true" | 84 android:textAllCaps="true" |
84 android:textColor="@color/photo_picker_special_tile_color" /> | 85 android:textColor="@color/photo_picker_special_tile_color" /> |
85 </LinearLayout> | 86 </LinearLayout> |
86 </view> | 87 </view> |
OLD | NEW |