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 <merge xmlns:android="http://schemas.android.com/apk/res/android" |
| 7 xmlns:chrome="http://schemas.android.com/apk/res-auto" > |
7 | 8 |
8 <!-- Widget style adapted from the UX spec: | 9 <!-- Widget style adapted from the UX spec: |
9 https://bugs.chromium.org/p/chromium/issues/detail?id=658246&desc=2#c18 | 10 https://bugs.chromium.org/p/chromium/issues/detail?id=658246&desc=2#c18 |
10 --> | 11 --> |
11 <LinearLayout | 12 <LinearLayout |
12 android:layout_width="match_parent" | 13 android:layout_width="match_parent" |
13 android:layout_height="wrap_content" | 14 android:layout_height="wrap_content" |
14 android:layout_marginStart="@dimen/drawer_margin_large" | 15 android:layout_marginStart="@dimen/drawer_margin_large" |
15 android:layout_marginEnd="@dimen/drawer_margin_large" | 16 android:layout_marginEnd="@dimen/drawer_margin_large" |
16 android:paddingTop="26dp" | 17 android:paddingTop="26dp" |
17 android:paddingBottom="24dp" | 18 android:paddingBottom="24dp" |
18 android:orientation="vertical" > | 19 android:orientation="vertical" > |
19 | 20 |
20 <TextView | 21 <TextView |
21 android:id="@+id/size_downloaded" | 22 android:id="@+id/size_downloaded" |
22 android:layout_width="match_parent" | 23 android:layout_width="match_parent" |
23 android:layout_height="wrap_content" | 24 android:layout_height="wrap_content" |
24 android:singleLine="true" | 25 android:singleLine="true" |
25 android:textColor="@color/light_active_color" | 26 android:textColor="@color/light_active_color" |
26 android:textSize="20sp" /> | 27 android:textSize="20sp" /> |
27 | 28 |
28 <!-- The progress bar uses 32dp of space, vertically, including spacing.
--> | 29 <!-- The progress bar uses 32dp of space, vertically, including spacing.
--> |
29 <ProgressBar | 30 <org.chromium.chrome.browser.widget.MaterialProgressBar |
30 android:id="@+id/space_bar" | 31 android:id="@+id/space_bar" |
31 style="@style/MaterialProgressBar" | |
32 android:layout_width="match_parent" | 32 android:layout_width="match_parent" |
33 android:layout_height="4dp" | 33 android:layout_height="4dp" |
34 android:layout_marginTop="14dp" | 34 android:layout_marginTop="14dp" |
35 android:layout_marginBottom="14dp" /> | 35 android:layout_marginBottom="14dp" |
| 36 chrome:colorBackground="@color/google_grey_400" |
| 37 chrome:colorProgress="@color/light_active_color" |
| 38 chrome:colorSecondaryProgress="@color/google_grey_600" /> |
36 | 39 |
37 <TextView | 40 <TextView |
38 android:id="@+id/size_other_apps" | 41 android:id="@+id/size_other_apps" |
39 android:layout_width="match_parent" | 42 android:layout_width="match_parent" |
40 android:layout_height="wrap_content" | 43 android:layout_height="wrap_content" |
41 android:singleLine="true" | 44 android:singleLine="true" |
42 android:textColor="@color/google_grey_600" | 45 android:textColor="@color/google_grey_600" |
43 android:textSize="12sp" /> | 46 android:textSize="12sp" /> |
44 | 47 |
45 <TextView | 48 <TextView |
46 android:id="@+id/size_free" | 49 android:id="@+id/size_free" |
47 android:layout_width="match_parent" | 50 android:layout_width="match_parent" |
48 android:layout_height="wrap_content" | 51 android:layout_height="wrap_content" |
49 android:singleLine="true" | 52 android:singleLine="true" |
50 android:textColor="@color/google_grey_400" | 53 android:textColor="@color/google_grey_400" |
51 android:textSize="12sp" /> | 54 android:textSize="12sp" /> |
52 | 55 |
53 </LinearLayout> | 56 </LinearLayout> |
54 | 57 |
55 </merge> | 58 </merge> |
OLD | NEW |