From 70c5fb749ca34cfe1e7a156d97f5bb32e81d5ddc Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Fri, 27 Mar 2015 09:38:42 +0100
Subject: Improve profile setting layouts.

Make their look consistent to the stock preferences look.

Change-Id: I4fca6ab57eb549c0d8f28e5d4f1462fcead47bef
---
 res/layout/dialog_profiles_volume_override.xml |  9 ++++++---
 res/layout/fragment_setup_actions.xml          |  5 +----
 res/layout/list_two_line_item.xml              | 18 +++++++++---------
 res/layout/profile_list_header.xml             | 20 ++++++++------------
 res/layout/profile_list_item.xml               | 23 ++++++++++-------------
 5 files changed, 34 insertions(+), 41 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/dialog_profiles_volume_override.xml b/res/layout/dialog_profiles_volume_override.xml
index 29a0fb3..82130b0 100644
--- a/res/layout/dialog_profiles_volume_override.xml
+++ b/res/layout/dialog_profiles_volume_override.xml
@@ -17,6 +17,8 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
+              android:paddingStart="20dip"
+              android:paddingEnd="20dip"
               android:gravity="center_horizontal">
 
     <CheckBox
@@ -24,11 +26,12 @@
             android:text="@string/profile_volume_override_checkbox_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="20dip" />
+            android:layout_marginTop="20dip" />
 
     <SeekBar android:id="@+id/seekbar"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
-             android:padding="20dip" />
+             android:layout_marginTop="20dip"
+             android:layout_marginBottom="20dip" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/fragment_setup_actions.xml b/res/layout/fragment_setup_actions.xml
index 3670550..1cc2f3b 100644
--- a/res/layout/fragment_setup_actions.xml
+++ b/res/layout/fragment_setup_actions.xml
@@ -21,10 +21,7 @@
         android:id="@android:id/list"
         android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:paddingStart="@*android:dimen/preference_item_padding_side"
-        android:paddingEnd="@*android:dimen/preference_item_padding_side"/>
-
+        android:layout_height="0dp" />
 
     <View style="@style/settingSeparator" />
 
diff --git a/res/layout/list_two_line_item.xml b/res/layout/list_two_line_item.xml
index 388af80..43800b9 100644
--- a/res/layout/list_two_line_item.xml
+++ b/res/layout/list_two_line_item.xml
@@ -4,25 +4,25 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
     android:orientation="vertical"
-    android:gravity="center"
+    android:gravity="center_vertical"
     >
 
     <TextView
         android:id="@+id/title"
-        android:padding="4dp"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-        android:textColor="?android:attr/textColorPrimary" />
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItem" />
 
     <TextView
         android:id="@+id/summary"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
         android:textColor="?android:attr/textColorSecondary" />
 
 </LinearLayout>
diff --git a/res/layout/profile_list_header.xml b/res/layout/profile_list_header.xml
index 7f43823..d4c7c2b 100644
--- a/res/layout/profile_list_header.xml
+++ b/res/layout/profile_list_header.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="4dip"
-    android:paddingTop="18dip"
-    android:orientation="horizontal" >
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="16dip"
+    android:textAppearance="@style/TextAppearance.CategoryTitle"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="16dip" />
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.CategoryTitle" />
-
-</LinearLayout>
diff --git a/res/layout/profile_list_item.xml b/res/layout/profile_list_item.xml
index 8ea8abe..876a3e3 100644
--- a/res/layout/profile_list_item.xml
+++ b/res/layout/profile_list_item.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/title"
-        android:padding="4dp"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:textSize="18sp"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
-
-</LinearLayout>
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    android:textAppearance="?android:attr/textAppearanceListItem"
+    android:textSize="18sp" />
-- 
cgit v1.1