From 9ddfa6499ccca5767ca6d3b467957b35fe09bf9d Mon Sep 17 00:00:00 2001
From: Veeti Paananen <veeti.paananen@rojekti.fi>
Date: Sun, 1 Dec 2013 01:36:21 +0200
Subject: [PATCH] Gingerbread pls go

Look like an Android app from 2013.

Remove the redundant Gingerbread button styles from buttons to
automatically use the Holo theme on phones that don't run a 3+ year old
operating system.

Create a new style for horizontal progress bars that uses the Holo
progress bar style on v11 and above.
---
 res/layout/change_passphrase_activity.xml     | 6 ++----
 res/layout/create_passphrase_activity.xml     | 3 +--
 res/layout/database_migration_activity.xml    | 8 +++-----
 res/layout/prompt_apn_activity.xml            | 6 ++----
 res/layout/prompt_passphrase_activity.xml     | 3 +--
 res/layout/registration_activity.xml          | 3 +--
 res/layout/registration_progress_activity.xml | 2 +-
 res/values-v11/styles.xml                     | 7 +++++++
 res/values/styles.xml                         | 3 +++
 9 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 res/values-v11/styles.xml

diff --git a/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml
index b235e6253f..6253c28b13 100644
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -60,8 +60,7 @@
                           android:layout_height="wrap_content"
                           android:layout_marginTop="30dip">
 
-                <Button style="@android:style/Widget.Button"
-                        android:id="@+id/cancel_button"
+                <Button android:id="@+id/cancel_button"
                         android:text="@android:string/cancel"
                         android:layout_weight="1"
                         android:layout_width="0dp"
@@ -69,8 +68,7 @@
                         android:layout_marginRight="7dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
                 
-                <Button style="@android:style/Widget.Button"
-                        android:id="@+id/ok_button"
+                <Button android:id="@+id/ok_button"
                         android:text="@android:string/ok"
                         android:layout_weight="1"
                         android:layout_width="0dp"
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index 1288737b35..152909b88f 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -50,8 +50,7 @@
                       android:inputType="textPassword"
                       android:singleLine="true"/>
                         
-            <Button style="@android:style/Widget.Button"
-                    android:id="@+id/ok_button"
+            <Button android:id="@+id/ok_button"
                     android:text="@string/create_passphrase_activity__continue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout/database_migration_activity.xml b/res/layout/database_migration_activity.xml
index 3a6517840a..87bc8ebe03 100644
--- a/res/layout/database_migration_activity.xml
+++ b/res/layout/database_migration_activity.xml
@@ -43,8 +43,7 @@
                           android:layout_height="wrap_content"
                           android:layout_marginTop="20dip">
 
-                <Button style="@android:style/Widget.Button"
-                        android:id="@+id/skip_button"
+                <Button android:id="@+id/skip_button"
                         android:text="@string/database_migration_activity__skip"
                         android:layout_weight="1"
                         android:layout_width="0dp"
@@ -52,8 +51,7 @@
                         android:layout_marginRight="7dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
                 
-                <Button style="@android:style/Widget.Button"
-                        android:id="@+id/import_button"
+                <Button android:id="@+id/import_button"
                         android:text="@string/database_migration_activity__import"
                         android:layout_weight="1"
                         android:layout_width="0dp"
@@ -112,7 +110,7 @@
 
             <ProgressBar
                 android:id="@+id/import_progress"
-                style="@android:style/Widget.ProgressBar.Horizontal"
+                style="@style/Widget.ProgressBar.Horizontal"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="14.0dip"
diff --git a/res/layout/prompt_apn_activity.xml b/res/layout/prompt_apn_activity.xml
index ef277eba51..b95c3fa981 100644
--- a/res/layout/prompt_apn_activity.xml
+++ b/res/layout/prompt_apn_activity.xml
@@ -38,8 +38,7 @@
                           android:layout_marginTop="10dip"
                           android:layout_marginBottom="20dip">
 
-                <Button style="@android:style/Widget.Button"
-                        android:id="@+id/cancel_button"
+                <Button android:id="@+id/cancel_button"
                         android:text="@android:string/cancel"
                         android:layout_weight="1"
                         android:layout_width="0dp"
@@ -47,8 +46,7 @@
                         android:layout_marginRight="7dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
                 
-                <Button style="@android:style/Widget.Button"
-                        android:id="@+id/ok_button"
+                <Button android:id="@+id/ok_button"
                         android:text="@android:string/ok"
                         android:layout_weight="1"
                         android:layout_width="0dp"
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 3c829b3529..395e17f772 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -45,8 +45,7 @@
                           android:layout_marginTop="20dip"
                           android:layout_marginRight="20dip">
                 
-                <Button style="@android:style/Widget.Button"
-                        android:id="@+id/ok_button"
+                <Button android:id="@+id/ok_button"
                         android:text="@string/prompt_passphrase_activity__unlock"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index 466b710842..e776062b6b 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -69,8 +69,7 @@
 
             </LinearLayout>
 
-            <Button style="@android:style/Widget.Button"
-                    android:id="@+id/registerButton"
+            <Button android:id="@+id/registerButton"
                     android:text="Register"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout/registration_progress_activity.xml b/res/layout/registration_progress_activity.xml
index 4032aa0a5b..c49b007b21 100644
--- a/res/layout/registration_progress_activity.xml
+++ b/res/layout/registration_progress_activity.xml
@@ -536,7 +536,7 @@
 
             <ProgressBar
                     android:id="@+id/registration_progress"
-                    style="@android:style/Widget.ProgressBar.Horizontal"
+                    style="@style/Widget.ProgressBar.Horizontal"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="14.0dip"
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100644
index 0000000000..e5a9a0dffe
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7852dd8277..a935075f9d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -85,4 +85,7 @@
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
+    </style>
+
 </resources>