OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 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 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 6 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
7 xmlns:tools="http://schemas.android.com/tools" | 7 xmlns:tools="http://schemas.android.com/tools" |
8 android:id="@+id/data_reduction_stats_container" | 8 android:id="@+id/data_reduction_stats_container" |
9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
10 android:layout_height="wrap_content" | 10 android:layout_height="wrap_content" |
11 android:clipChildren="false" | 11 android:clipChildren="false" |
12 android:clipToPadding="false" | 12 android:clipToPadding="false" |
13 android:orientation="vertical" > | 13 android:orientation="vertical" > |
14 | 14 |
15 <LinearLayout | 15 <LinearLayout |
16 android:layout_width="match_parent" | 16 android:layout_width="match_parent" |
17 android:layout_height="wrap_content" | 17 android:layout_height="wrap_content" |
| 18 android:layout_marginTop="8dp" |
18 android:baselineAligned="false" | 19 android:baselineAligned="false" |
19 android:orientation="horizontal" > | 20 android:orientation="horizontal" > |
20 | 21 |
21 <LinearLayout | 22 <LinearLayout |
22 android:layout_height="wrap_content" | 23 android:layout_height="wrap_content" |
23 android:layout_width="0dp" | 24 android:layout_width="0dp" |
24 android:layout_weight="1" | 25 android:layout_weight="1" |
25 android:orientation="vertical" > | 26 android:orientation="vertical" > |
26 | 27 |
27 <LinearLayout | 28 <LinearLayout |
28 android:layout_width="wrap_content" | 29 android:layout_width="wrap_content" |
29 android:layout_height="wrap_content" | 30 android:layout_height="wrap_content" |
30 android:layout_marginTop="8dp" | |
31 android:orientation="horizontal" > | 31 android:orientation="horizontal" > |
32 | 32 |
33 <TextView | 33 <TextView |
34 android:layout_width="match_parent" | 34 android:layout_width="match_parent" |
35 android:layout_height="wrap_content" | 35 android:layout_height="wrap_content" |
36 android:singleLine="true" | 36 android:singleLine="true" |
37 android:text="@string/data_reduction_savings_label" | 37 android:text="@string/data_reduction_savings_label" |
38 android:textAppearance="@style/PreferenceCategoryTextStyle"
/> | 38 android:textAppearance="@style/PreferenceCategoryTextStyle"
/> |
39 | 39 |
40 <TextView | 40 <TextView |
41 android:id="@+id/data_reduction_savings" | 41 android:id="@+id/data_reduction_savings" |
42 android:layout_width="wrap_content" | 42 android:layout_width="wrap_content" |
43 android:layout_height="wrap_content" | 43 android:layout_height="wrap_content" |
44 android:paddingStart="3dp" | 44 android:paddingStart="3dp" |
45 android:textAppearance="@style/PreferenceCategoryTextStyle"
/> | 45 android:textAppearance="@style/PreferenceCategoryTextStyle"
/> |
46 | 46 |
47 </LinearLayout> | 47 </LinearLayout> |
48 | 48 |
49 <LinearLayout | 49 <LinearLayout |
50 android:layout_width="wrap_content" | 50 android:layout_width="wrap_content" |
51 android:layout_height="wrap_content" | 51 android:layout_height="wrap_content" |
52 android:layout_marginTop="4dp" | 52 android:layout_marginTop="4dp" |
53 android:orientation="horizontal" > | 53 android:orientation="horizontal" > |
54 | 54 |
55 <TextView | 55 <TextView |
56 android:layout_width="match_parent" | 56 android:layout_width="match_parent" |
57 android:layout_height="wrap_content" | 57 android:layout_height="wrap_content" |
58 android:singleLine="true" | 58 android:singleLine="true" |
59 android:text="@string/data_reduction_usage_label" | 59 android:text="@string/data_reduction_usage_label" |
60 android:textColor="?android:attr/textColorSecondary" | 60 android:textAppearance="@style/DataReductionPrefSecondarySty
le" /> |
61 android:textSize="14sp" /> | |
62 | 61 |
63 <TextView | 62 <TextView |
64 android:id="@+id/data_reduction_usage" | 63 android:id="@+id/data_reduction_usage" |
65 android:layout_width="wrap_content" | 64 android:layout_width="wrap_content" |
66 android:layout_height="wrap_content" | 65 android:layout_height="wrap_content" |
67 android:paddingStart="3dp" | 66 android:paddingStart="3dp" |
68 android:textColor="?android:attr/textColorSecondary" | 67 android:textAppearance="@style/DataReductionPrefSecondarySty
le" /> |
69 android:textSize="14sp" /> | |
70 </LinearLayout> | 68 </LinearLayout> |
71 | 69 |
72 </LinearLayout> | 70 </LinearLayout> |
73 | 71 |
74 <TextView | 72 <TextView |
75 android:id="@+id/data_reduction_percent" | 73 android:id="@+id/data_reduction_percent" |
76 android:layout_height="wrap_content" | 74 android:layout_height="wrap_content" |
77 android:layout_width="wrap_content" | 75 android:layout_width="wrap_content" |
78 android:layout_marginTop="0dp" | 76 android:layout_marginTop="0dp" |
79 android:includeFontPadding="false" | 77 android:includeFontPadding="false" |
80 android:textColor="@color/light_active_color" | 78 android:textColor="@color/light_active_color" |
81 android:textSize="50sp" /> | 79 android:textSize="34sp" /> |
82 | 80 |
83 </LinearLayout> | 81 </LinearLayout> |
84 | 82 |
85 <include layout="@layout/data_usage_chart" /> | 83 <include layout="@layout/data_usage_chart" /> |
86 | 84 |
87 <LinearLayout | 85 <LinearLayout |
88 android:layout_width="match_parent" | 86 android:layout_width="match_parent" |
89 android:layout_height="wrap_content" > | 87 android:layout_height="wrap_content" > |
90 | 88 |
91 <TextView | 89 <TextView |
(...skipping 21 matching lines...) Expand all Loading... |
113 android:layout_marginTop="20dp" | 111 android:layout_marginTop="20dp" |
114 android:drawableStart="@drawable/exclamation_triangle" | 112 android:drawableStart="@drawable/exclamation_triangle" |
115 android:drawablePadding="6dp" | 113 android:drawablePadding="6dp" |
116 android:text="@string/data_reduction_proxy_unreachable_warn" | 114 android:text="@string/data_reduction_proxy_unreachable_warn" |
117 android:textColor="?android:attr/textColorPrimary" | 115 android:textColor="?android:attr/textColorPrimary" |
118 android:textSize="14sp" /> | 116 android:textSize="14sp" /> |
119 | 117 |
120 <include layout="@layout/data_usage_breakdown" /> | 118 <include layout="@layout/data_usage_breakdown" /> |
121 | 119 |
122 </LinearLayout> | 120 </LinearLayout> |
OLD | NEW |