| 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 <!-- TODO(dfalcantara): Figure out how to split off the units from the value
and | 8 <LinearLayout |
| 9 then make that part of the string smaller with a Spa
nnable. | 9 android:layout_width="match_parent" |
| 10 --> | 10 android:layout_height="wrap_content" |
| 11 <TextView | 11 android:layout_marginStart="@dimen/drawer_margin_large" |
| 12 android:id="@+id/space_used_display" | 12 android:layout_marginEnd="@dimen/drawer_margin_large" |
| 13 android:layout_width="match_parent" | 13 android:orientation="vertical" > |
| 14 android:layout_height="wrap_content" | |
| 15 android:paddingStart="@dimen/drawer_margin_large" | |
| 16 android:paddingEnd="@dimen/drawer_margin_large" | |
| 17 android:textColor="@color/light_active_color" | |
| 18 android:textSize="28sp" /> | |
| 19 | 14 |
| 20 <TextView | 15 <TextView |
| 21 android:id="@+id/space_total_display" | 16 android:id="@+id/size_downloaded" |
| 22 android:layout_width="match_parent" | 17 android:layout_width="match_parent" |
| 23 android:layout_height="wrap_content" | 18 android:layout_height="wrap_content" |
| 24 android:paddingStart="@dimen/drawer_margin_large" | 19 android:singleLine="true" |
| 25 android:paddingEnd="@dimen/drawer_margin_large" | 20 android:textColor="@color/light_active_color" |
| 26 android:textColor="@color/descriptive_text_color" | 21 android:textSize="20sp" /> |
| 27 android:textSize="14sp" /> | |
| 28 | 22 |
| 29 <!-- The widget ends up claiming 48dp of space, vertically. --> | 23 <!-- The widget ends up claiming 32dp of space, vertically. --> |
| 30 <ProgressBar | 24 <ProgressBar |
| 31 android:id="@+id/space_bar" | 25 android:id="@+id/space_bar" |
| 32 style="@style/MaterialProgressBar" | 26 style="@style/MaterialProgressBar" |
| 33 android:layout_width="match_parent" | 27 android:layout_width="match_parent" |
| 34 android:layout_height="4dp" | 28 android:layout_height="4dp" |
| 35 android:layout_marginTop="22dp" | 29 android:layout_marginTop="14dp" |
| 36 android:layout_marginBottom="22dp" | 30 android:layout_marginBottom="14dp" /> |
| 37 android:layout_marginStart="@dimen/drawer_margin_large" | 31 |
| 38 android:layout_marginEnd="@dimen/drawer_margin_large" /> | 32 <TextView |
| 33 android:id="@+id/size_other_apps" |
| 34 android:layout_width="match_parent" |
| 35 android:layout_height="wrap_content" |
| 36 android:singleLine="true" |
| 37 android:textColor="@color/google_grey_600" |
| 38 android:textSize="14sp" /> |
| 39 |
| 40 <TextView |
| 41 android:id="@+id/size_free" |
| 42 android:layout_width="match_parent" |
| 43 android:layout_height="wrap_content" |
| 44 android:layout_marginBottom="22dp" |
| 45 android:singleLine="true" |
| 46 android:textColor="@color/material_progressbar_bg" |
| 47 android:textSize="14sp" /> |
| 48 |
| 49 </LinearLayout> |
| 39 | 50 |
| 40 </merge> | 51 </merge> |
| OLD | NEW |