From db6e541dc2668e2c1fd857afd91c806ca93e1ce3 Mon Sep 17 00:00:00 2001
From: tonymanou <tonymanou@gmail.com>
Date: Sat, 30 Aug 2014 00:03:40 +0200
Subject: [PATCH 1/3] PreferenceActivity-like style for settings activity

---
 res/layout/settings.xml | 280 ++++++++++++++++++++++------------------
 1 file changed, 151 insertions(+), 129 deletions(-)

diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 4101891f0..886d1073d 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -28,140 +28,148 @@
             android:layout_marginBottom="6dp"
             android:background="#888888" />
 
-        <CheckBox
-            android:id="@+id/cbNotify"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_notify" />
-
-        <CheckBox
-            android:id="@+id/cbOnDemand"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/settings_ondemand" />
+            android:divider="?android:attr/listDivider"
+            android:orientation="vertical"
+            android:showDividers="middle" >
 
-        <CheckBox
-            android:id="@+id/cbBlacklist"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_blacklist" />
+            <CheckBox
+                android:id="@+id/cbNotify"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_notify" />
 
-        <CheckBox
-            android:id="@+id/cbUsage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_usagedata" />
+            <CheckBox
+                android:id="@+id/cbOnDemand"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_ondemand" />
 
-        <CheckBox
-            android:id="@+id/cbParameters"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_parameters" />
+            <CheckBox
+                android:id="@+id/cbBlacklist"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_blacklist" />
 
-        <CheckBox
-            android:id="@+id/cbLog"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_log" />
+            <CheckBox
+                android:id="@+id/cbUsage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_usagedata" />
 
-        <CheckBox
-            android:id="@+id/cbExpert"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_expert" />
+            <CheckBox
+                android:id="@+id/cbParameters"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_parameters" />
 
-        <CheckBox
-            android:id="@+id/cbSystem"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:background="?attr/color_dangerous"
-            android:text="@string/settings_syscomponents" />
+            <CheckBox
+                android:id="@+id/cbLog"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_log" />
 
-        <CheckBox
-            android:id="@+id/cbExperimental"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/settings_experimental"
-            android:visibility="gone" />
+            <CheckBox
+                android:id="@+id/cbExpert"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_expert" />
 
-        <CheckBox
-            android:id="@+id/cbHttps"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/settings_https" />
+            <CheckBox
+                android:id="@+id/cbSystem"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dip"
+                android:background="?attr/color_dangerous"
+                android:text="@string/settings_syscomponents" />
 
-        <CheckBox
-            android:id="@+id/cbAOSP"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/settings_aosp"
-            android:visibility="gone" />
+            <CheckBox
+                android:id="@+id/cbExperimental"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dip"
+                android:text="@string/settings_experimental"
+                android:visibility="gone" />
 
-        <LinearLayout
-            android:id="@+id/llConfidence"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:gravity="center_vertical"
-            android:orientation="horizontal" >
+            <CheckBox
+                android:id="@+id/cbHttps"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dip"
+                android:text="@string/settings_https" />
 
-            <TextView
-                android:layout_width="0dip"
+            <CheckBox
+                android:id="@+id/cbAOSP"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/settings_confidence"
-                android:textIsSelectable="false" />
+                android:layout_marginLeft="30dip"
+                android:text="@string/settings_aosp"
+                android:visibility="gone" />
 
-            <EditText
-                android:id="@+id/etConfidence"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/llConfidence"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="35"
-                android:inputType="numberDecimal"
-                android:maxLength="2"
-                tools:ignore="HardcodedText" />
-        </LinearLayout>
+                android:layout_marginLeft="30dip"
+                android:gravity="center_vertical"
+                android:orientation="horizontal" >
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:orientation="horizontal" >
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/settings_confidence"
+                    android:textIsSelectable="false" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="@string/settings_quirks"
-                android:textIsSelectable="false" />
+                <EditText
+                    android:id="@+id/etConfidence"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:hint="35"
+                    android:inputType="numberDecimal"
+                    android:maxLength="2"
+                    tools:ignore="HardcodedText" />
+            </LinearLayout>
 
-            <EditText
-                android:id="@+id/etQuirks"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="freeze,resolve,test"
-                android:inputType="text"
-                tools:ignore="HardcodedText" />
-        </LinearLayout>
+                android:layout_marginLeft="30dip"
+                android:orientation="horizontal" >
 
-        <Button
-            android:id="@+id/btnFlush"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/menu_flush" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="@string/settings_quirks"
+                    android:textIsSelectable="false" />
 
-        <Button
-            android:id="@+id/btnClearDb"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/menu_clear_db" />
+                <EditText
+                    android:id="@+id/etQuirks"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="freeze,resolve,test"
+                    android:inputType="text"
+                    tools:ignore="HardcodedText" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/btnFlush"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dip"
+                android:text="@string/menu_flush" />
+
+            <Button
+                android:id="@+id/btnClearDb"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dip"
+                android:text="@string/menu_clear_db" />
+        </LinearLayout>
 
         <TextView
             android:layout_width="wrap_content"
@@ -177,30 +185,44 @@
             android:layout_marginBottom="6dp"
             android:background="#888888" />
 
-        <CheckBox
-            android:id="@+id/cbRandom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/msg_random_boot" />
-
-        <Button
-            android:id="@+id/btnRandom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/msg_random_now" />
-
-        <Button
-            android:id="@+id/btnClear"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/menu_clear" />
-
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:divider="?android:attr/listDivider"
+            android:showDividers="middle"
             android:shrinkColumns="2"
             android:stretchColumns="2" >
 
+            <TableRow>
+
+                <CheckBox
+                    android:id="@+id/cbRandom"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_span="3"
+                    android:text="@string/msg_random_boot" />
+            </TableRow>
+
+            <TableRow>
+
+                <Button
+                    android:id="@+id/btnClear"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_span="3"
+                    android:text="@string/menu_clear" />
+            </TableRow>
+
+            <TableRow>
+
+                <Button
+                    android:id="@+id/btnRandom"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_span="3"
+                    android:text="@string/msg_random_now" />
+            </TableRow>
+
             <TableRow>
 
                 <ImageView

From e2c88f3c3e61b0bd98defadc6b84813b75e2e6d5 Mon Sep 17 00:00:00 2001
From: tonymanou <tonymanou@gmail.com>
Date: Sat, 30 Aug 2014 01:41:52 +0200
Subject: [PATCH 2/3] Using custom style to have an height of 48dp for every
 setting lines

---
 res/layout/settings.xml   | 102 ++++++++++++++++----------------------
 res/values-v14/styles.xml |   9 +++-
 2 files changed, 51 insertions(+), 60 deletions(-)

diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 886d1073d..20f1398a8 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -37,83 +37,70 @@
 
             <CheckBox
                 android:id="@+id/cbNotify"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:text="@string/settings_notify" />
 
             <CheckBox
                 android:id="@+id/cbOnDemand"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:text="@string/settings_ondemand" />
 
             <CheckBox
                 android:id="@+id/cbBlacklist"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:text="@string/settings_blacklist" />
 
             <CheckBox
                 android:id="@+id/cbUsage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:text="@string/settings_usagedata" />
 
             <CheckBox
                 android:id="@+id/cbParameters"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:text="@string/settings_parameters" />
 
             <CheckBox
                 android:id="@+id/cbLog"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:text="@string/settings_log" />
 
             <CheckBox
                 android:id="@+id/cbExpert"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:text="@string/settings_expert" />
 
             <CheckBox
                 android:id="@+id/cbSystem"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
                 android:background="?attr/color_dangerous"
                 android:text="@string/settings_syscomponents" />
 
             <CheckBox
                 android:id="@+id/cbExperimental"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
                 android:text="@string/settings_experimental"
                 android:visibility="gone" />
 
             <CheckBox
                 android:id="@+id/cbHttps"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
                 android:text="@string/settings_https" />
 
             <CheckBox
                 android:id="@+id/cbAOSP"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
                 android:text="@string/settings_aosp"
                 android:visibility="gone" />
 
             <LinearLayout
                 android:id="@+id/llConfidence"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
-                android:gravity="center_vertical"
                 android:orientation="horizontal" >
 
                 <TextView
@@ -134,16 +121,13 @@
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
                 android:orientation="horizontal" >
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:singleLine="true"
                     android:text="@string/settings_quirks"
                     android:textIsSelectable="false" />
 
@@ -158,16 +142,16 @@
 
             <Button
                 android:id="@+id/btnFlush"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
+                android:gravity="center"
                 android:text="@string/menu_flush" />
 
             <Button
                 android:id="@+id/btnClearDb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/PreferenceLine"
                 android:layout_marginLeft="30dip"
+                android:gravity="center"
                 android:text="@string/menu_clear_db" />
         </LinearLayout>
 
@@ -193,7 +177,7 @@
             android:shrinkColumns="2"
             android:stretchColumns="2" >
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox
                     android:id="@+id/cbRandom"
@@ -203,7 +187,7 @@
                     android:text="@string/msg_random_boot" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <Button
                     android:id="@+id/btnClear"
@@ -213,7 +197,7 @@
                     android:text="@string/menu_clear" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <Button
                     android:id="@+id/btnRandom"
@@ -223,7 +207,7 @@
                     android:text="@string/msg_random_now" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -239,7 +223,7 @@
                     android:textIsSelectable="false" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbSerial" />
 
@@ -255,7 +239,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbLat" />
 
@@ -271,7 +255,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbLon" />
 
@@ -287,7 +271,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbAlt" />
 
@@ -303,7 +287,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -322,7 +306,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbMac" />
 
@@ -340,7 +324,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -357,7 +341,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbImei" />
 
@@ -375,7 +359,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbPhone" />
 
@@ -391,7 +375,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbId" />
 
@@ -408,7 +392,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbGsfId" />
 
@@ -425,7 +409,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbAdId" />
 
@@ -442,7 +426,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -459,7 +443,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -476,7 +460,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbCountry" />
 
@@ -494,7 +478,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -510,7 +494,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -526,7 +510,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -542,7 +526,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -558,7 +542,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbSubscriber" />
 
@@ -573,7 +557,7 @@
                     android:singleLine="true" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbSSID" />
 
@@ -587,7 +571,7 @@
                     android:singleLine="true" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index c442fe07d..9c57b5b54 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="CustomTheme" parent="android:Theme.Holo">
         <item name="icon_granted">@drawable/granted_holo_dark</item>
@@ -66,4 +66,11 @@
         <item name="android:windowActionBar">true</item>
     </style>
 
+    <style name="PreferenceLine">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:minHeight">48dp</item>
+    </style>
+
 </resources>
\ No newline at end of file

From cc72f31ea69c8f77d3b00746ebaf81baa099c9c0 Mon Sep 17 00:00:00 2001
From: tonymanou <tonymanou@gmail.com>
Date: Sat, 30 Aug 2014 15:13:15 +0200
Subject: [PATCH 3/3] Outside overlay scrollbar looks nicer

---
 res/layout/settings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 20f1398a8..a1203aa9d 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -8,6 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:scrollbarStyle="outsideOverlay"
     tools:ignore="HardcodedText,TooManyViews,Overdraw" >
 
     <LinearLayout