Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: chrome/android/java/res/layout/photo_picker_bitmap_view.xml

Issue 2843973002: Use larger vector graphics for special tiles and fix selection ring. (Closed)
Patch Set: Fix unused variable issue Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 android:layout_width="wrap_content" 12 android:layout_width="wrap_content"
13 android:layout_height="wrap_content"> 13 android:layout_height="wrap_content">
14 14
15 <FrameLayout 15 <FrameLayout
16 android:id="@+id/border" 16 android:id="@+id/border"
17 android:layout_width="wrap_content" 17 android:layout_width="wrap_content"
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 android:layout_gravity="center"> 19 android:layout_gravity="center">
20 20
21 <ImageView 21 <ImageView
22 android:id="@+id/bitmap_view" 22 android:id="@+id/bitmap_view"
23 android:layout_width="wrap_content" 23 android:layout_width="wrap_content"
24 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
25 android:contentDescription="@null" /> 25 android:contentDescription="@null" />
26 26
27 <View 27 <ImageView
28 android:id="@+id/scrim" 28 android:id="@+id/scrim"
29 android:layout_width="64dp" 29 android:layout_width="64dp"
30 android:layout_height="64dp" 30 android:layout_height="64dp"
31 android:background="@drawable/file_picker_scrim" 31 android:background="@drawable/file_picker_scrim"
32 android:contentDescription="@null"
32 android:visibility="gone" /> 33 android:visibility="gone" />
33 </FrameLayout> 34 </FrameLayout>
34 35
35 <ImageView 36 <ImageView
36 android:id="@+id/selected" 37 android:id="@+id/selected"
37 android:layout_width="24dp" 38 android:layout_width="26dp"
38 android:layout_height="24dp" 39 android:layout_height="26dp"
39 android:layout_marginStart="4dp" 40 android:layout_marginStart="2dp"
40 android:layout_marginTop="4dp" 41 android:layout_marginTop="2dp"
42 android:background="@drawable/checkmark_blue"
41 android:contentDescription="@null" 43 android:contentDescription="@null"
42 android:src="@drawable/verify_checkmark"
43 android:visibility="gone" /> 44 android:visibility="gone" />
44 45
45 <View 46 <ImageView
46 android:id="@+id/unselected" 47 android:id="@+id/unselected"
47 android:layout_width="22dp" 48 android:layout_width="22dp"
48 android:layout_height="22dp" 49 android:layout_height="22dp"
49 android:layout_marginStart="4dp" 50 android:layout_marginStart="4dp"
50 android:layout_marginTop="4dp" 51 android:layout_marginTop="4dp"
51 android:background="@drawable/circle_white" 52 android:background="@drawable/circle_white"
53 android:contentDescription="@null"
52 android:visibility="gone" /> 54 android:visibility="gone" />
53 55
54 <!-- Special tiles, that give access to the camera and gallery --> 56 <!-- Special tiles, that give access to the camera and gallery -->
55 <TextView 57 <LinearLayout
56 android:id="@+id/special_tile" 58 android:id="@+id/special_tile"
57 android:layout_width="match_parent" 59 android:layout_width="match_parent"
58 android:layout_height="wrap_content" 60 android:layout_height="wrap_content"
59 android:layout_marginTop="@dimen/photo_picker_label_gap" 61 android:orientation="vertical"
60 android:drawablePadding="10dp" 62 android:layout_gravity="center"
61 android:fontFamily="sans-serif-medium"
62 android:textStyle="bold"
63 android:textSize="14sp"
64 android:textAllCaps="true"
65 android:textColor="@color/photo_picker_special_tile_color"
66 android:gravity="center" 63 android:gravity="center"
67 android:layout_gravity="center" /> 64 android:visibility="gone">
65
66 <ImageView
67 android:id="@+id/special_tile_icon"
68 android:adjustViewBounds="true"
69 android:layout_width="48dp"
70 android:layout_height="48dp"
71 android:contentDescription="@null"
72 android:tint="@color/photo_picker_special_tile_color" />
73
74 <TextView
75 android:id="@+id/special_tile_label"
76 android:layout_width="match_parent"
77 android:layout_height="wrap_content"
78 android:layout_marginTop="@dimen/photo_picker_label_gap"
79 android:fontFamily="sans-serif-medium"
80 android:gravity="center"
81 android:textStyle="bold"
82 android:textSize="14sp"
83 android:textAllCaps="true"
84 android:textColor="@color/photo_picker_special_tile_color" />
85 </LinearLayout>
68 </view> 86 </view>
OLDNEW
« no previous file with comments | « chrome/android/java/res/drawable/circle_white.xml ('k') | chrome/android/java/res/values/colors.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698