Merge "Fix new DataUsageSummary page line spacing." into pi-dev
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index b54362a..c1a676a 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -18,6 +18,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingTop="24dp"
+ android:paddingBottom="32dp"
android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical"
@@ -31,26 +33,18 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
- android:paddingBottom="5dp"
android:text="@string/data_usage_title" />
<TextView
android:id="@android:id/title"
+ android:paddingTop="12dp"
+ android:paddingBottom="4dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="5dp"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:textColor="?android:attr/colorAccent"
android:textAppearance="@android:style/TextAppearance.Material.Large" />
- <TextView
- android:id="@android:id/summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceListItemSecondary"
- android:textColor="?android:attr/textColorSecondary"
- android:paddingBottom="5dp" />
-
<com.android.settings.widget.LinearColorBar
android:id="@+id/color_bar"
android:layout_width="match_parent"
@@ -60,7 +54,8 @@
android:id="@+id/label_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="2dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="8dp"
android:orientation="horizontal">
<TextView android:id="@android:id/text1"
@@ -84,18 +79,18 @@
<TextView
android:id="@+id/cycle_left_time"
+ android:paddingTop="4dp"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="5dp" />
+ android:layout_height="wrap_content" />
<TextView
android:id="@+id/carrier_and_update"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="5dp" />
+ android:layout_height="wrap_content" />
<Button
android:id="@+id/launch_mdp_app_button"
+ android:paddingTop="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"