| 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 <!-- TODO(dfalcantara): Figure out how to split off the units from the value
and |
| 9 then make that part of the string smaller with a Spa
nnable. | 9 then make that part of the string smaller with a Spa
nnable. |
| 10 --> | 10 --> |
| 11 <TextView | 11 <TextView |
| 12 android:id="@+id/space_used_display" | 12 android:id="@+id/space_used_display" |
| 13 android:layout_width="match_parent" | 13 android:layout_width="match_parent" |
| 14 android:layout_height="wrap_content" | 14 android:layout_height="wrap_content" |
| 15 android:paddingStart="@dimen/drawer_margin_large" | 15 android:paddingStart="@dimen/drawer_margin_large" |
| 16 android:paddingEnd="@dimen/drawer_margin_large" | 16 android:paddingEnd="@dimen/drawer_margin_large" |
| 17 android:textColor="@color/light_active_color" | 17 android:textColor="@color/light_active_color" |
| 18 android:textSize="28sp" /> | 18 android:textSize="28sp" /> |
| 19 | 19 |
| 20 <TextView | 20 <TextView |
| 21 android:id="@+id/space_total_display" | 21 android:id="@+id/space_total_display" |
| 22 android:layout_width="match_parent" | 22 android:layout_width="match_parent" |
| 23 android:layout_height="wrap_content" | 23 android:layout_height="wrap_content" |
| 24 android:paddingStart="@dimen/drawer_margin_large" | 24 android:paddingStart="@dimen/drawer_margin_large" |
| 25 android:paddingEnd="@dimen/drawer_margin_large" | 25 android:paddingEnd="@dimen/drawer_margin_large" |
| 26 android:textColor="@color/descriptive_text_color" | 26 android:textColor="@color/descriptive_text_color" |
| 27 android:textSize="14sp" /> | 27 android:textSize="14sp" /> |
| 28 | 28 |
| 29 <!-- TODO(dfalcantara): Style this toolbar as Material on JB & KK. | 29 <!-- The widget ends up claiming 48dp of space, vertically. --> |
| 30 These are currently broken in the support library an
d look Holo. | |
| 31 --> | |
| 32 <ProgressBar | 30 <ProgressBar |
| 33 android:id="@+id/space_bar" | 31 android:id="@+id/space_bar" |
| 34 style="@style/Widget.AppCompat.ProgressBar.Horizontal" | 32 style="@style/MaterialProgressBar" |
| 35 android:layout_width="match_parent" | 33 android:layout_width="match_parent" |
| 36 android:layout_height="wrap_content" | 34 android:layout_height="4dp" |
| 37 android:paddingTop="@dimen/drawer_margin_large" | 35 android:layout_marginTop="22dp" |
| 38 android:paddingBottom="@dimen/drawer_margin_large" | 36 android:layout_marginBottom="22dp" |
| 39 android:paddingStart="@dimen/drawer_margin_large" | 37 android:layout_marginStart="@dimen/drawer_margin_large" |
| 40 android:paddingEnd="@dimen/drawer_margin_large" /> | 38 android:layout_marginEnd="@dimen/drawer_margin_large" /> |
| 41 | 39 |
| 42 </merge> | 40 </merge> |
| OLD | NEW |