OLD | NEW |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 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 | 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 <merge xmlns:android="http://schemas.android.com/apk/res/android" | 6 <LinearLayout |
7 xmlns:chrome="http://schemas.android.com/apk/res-auto" > | 7 xmlns:android="http://schemas.android.com/apk/res/android" |
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" | |
9 android:layout_width="match_parent" | |
10 android:layout_height="wrap_content" | |
11 android:paddingStart="@dimen/downloads_item_margin" | |
12 android:paddingEnd="14dp" | |
13 android:paddingTop="26dp" | |
14 android:paddingBottom="6dp" | |
15 android:orientation="vertical" > | |
8 | 16 |
9 <!-- Widget style adapted from the UX spec: | 17 <TextView |
10 https://bugs.chromium.org/p/chromium/issues/detail?id=658246&desc=2#c18 | 18 android:id="@+id/size_downloaded" |
11 --> | |
12 <LinearLayout | |
13 android:layout_width="match_parent" | 19 android:layout_width="match_parent" |
14 android:layout_height="wrap_content" | 20 android:layout_height="wrap_content" |
15 android:layout_marginStart="@dimen/drawer_margin_large" | 21 android:singleLine="true" |
16 android:layout_marginEnd="@dimen/drawer_margin_large" | 22 android:textColor="@color/google_blue_500" |
17 android:paddingTop="26dp" | 23 android:textSize="16sp" |
18 android:paddingBottom="24dp" | 24 android:textStyle="bold" /> |
19 android:orientation="vertical" > | |
20 | 25 |
21 <TextView | 26 <!-- The progress bar uses 20dp of space, vertically, including spacing. --> |
22 android:id="@+id/size_downloaded" | 27 <org.chromium.chrome.browser.widget.MaterialProgressBar |
23 android:layout_width="match_parent" | 28 android:id="@+id/space_bar" |
24 android:layout_height="wrap_content" | 29 android:layout_width="match_parent" |
25 android:singleLine="true" | 30 android:layout_height="4dp" |
26 android:textColor="@color/light_active_color" | 31 android:layout_marginTop="8dp" |
27 android:textSize="20sp" /> | 32 android:layout_marginBottom="8dp" |
33 chrome:colorBackground="@color/black_alpha_38" | |
34 chrome:colorProgress="@color/google_blue_500" | |
35 chrome:colorSecondaryProgress="@color/black_alpha_87" /> | |
28 | 36 |
29 <!-- The progress bar uses 32dp of space, vertically, including spacing. --> | 37 <TextView |
30 <org.chromium.chrome.browser.widget.MaterialProgressBar | 38 android:id="@+id/size_other_apps" |
31 android:id="@+id/space_bar" | 39 android:layout_width="match_parent" |
32 android:layout_width="match_parent" | 40 android:layout_height="wrap_content" |
33 android:layout_height="4dp" | 41 android:singleLine="true" |
34 android:layout_marginTop="14dp" | 42 android:textColor="@color/black_alpha_87" |
35 android:layout_marginBottom="14dp" | 43 android:textSize="14sp" /> |
36 chrome:colorBackground="@color/google_grey_400" | |
37 chrome:colorProgress="@color/light_active_color" | |
38 chrome:colorSecondaryProgress="@color/google_grey_600" /> | |
39 | 44 |
40 <TextView | 45 <TextView |
41 android:id="@+id/size_other_apps" | 46 android:id="@+id/size_free" |
42 android:layout_width="match_parent" | 47 android:layout_width="match_parent" |
43 android:layout_height="wrap_content" | 48 android:layout_height="wrap_content" |
44 android:singleLine="true" | 49 android:singleLine="true" |
45 android:textColor="@color/google_grey_600" | 50 android:textColor="@color/black_alpha_54" |
Theresa
2017/04/25 21:48:49
I was thinking we could keep the colors exactly th
shaktisahu
2017/04/25 22:24:15
I would wait to hear from the UX.
| |
46 android:textSize="12sp" /> | 51 android:textSize="14sp" /> |
47 | 52 |
48 <TextView | 53 </LinearLayout> |
49 android:id="@+id/size_free" | |
50 android:layout_width="match_parent" | |
51 android:layout_height="wrap_content" | |
52 android:singleLine="true" | |
53 android:textColor="@color/google_grey_400" | |
54 android:textSize="12sp" /> | |
55 | |
56 </LinearLayout> | |
57 | |
58 </merge> | |
OLD | NEW |