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