From dff41ae33d4df6e3470934dd509d124e571500f2 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Sat, 2 Feb 2013 01:58:10 +0530
Subject: [PATCH] Cleanup styles, remove redundant ones. Fix My Contributions
 title

---
 commons/AndroidManifest.xml       |  4 ++--
 commons/res/values-v14/styles.xml |  2 --
 commons/res/values/strings.xml    |  2 ++
 commons/res/values/styles.xml     |  4 ++--
 commons/res/values/theme.xml      | 12 ------------
 5 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 commons/res/values/theme.xml

diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index 9662e0cd8..dfbbe4b4a 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:name=".CommonsApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Theme.Commons" >
+        android:theme="@style/AppTheme" >
         <activity
             android:name=".auth.LoginActivity"
             android:label="@string/title_activity_login"
@@ -42,7 +42,7 @@
         <activity
                 android:name=".contributions.ContributionsActivity"
                 android:icon="@drawable/ic_launcher"
-                android:label="@string/title_activity_share"
+                android:label="@string/title_activity_contributions"
                  >
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/commons/res/values-v14/styles.xml b/commons/res/values-v14/styles.xml
index d34c32769..b2d5c7f03 100644
--- a/commons/res/values-v14/styles.xml
+++ b/commons/res/values-v14/styles.xml
@@ -1,7 +1,5 @@
 <resources>
 
-    <style name="AppTheme" parent="android:Theme.Holo.Light" />
-
     <style name="NotificationProgress" parent="android:Widget.Holo.ProgressBar.Horizontal" />
 
 </resources>
\ No newline at end of file
diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml
index 7daa773e0..d0488164b 100644
--- a/commons/res/values/strings.xml
+++ b/commons/res/values/strings.xml
@@ -35,4 +35,6 @@
     <string name="transcoding_progress_title_finishing">Finished Transcoding %1$s</string>
     <string name="transcoding_failed_notification_title">Failed Transcoding %1$s</string>
     <string name="transcoding_failed_notification_subtitle">Tap to try again</string>
+
+    <string name="title_activity_contributions">My Contributions</string>
 </resources>
\ No newline at end of file
diff --git a/commons/res/values/styles.xml b/commons/res/values/styles.xml
index bdfd308eb..125c03c3e 100644
--- a/commons/res/values/styles.xml
+++ b/commons/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.Commons" />
+    <style name="AppTheme" parent="Theme.Sherlock.Light" />
 
     <style name="NoTitle" parent="AppTheme">
         <item name="android:windowNoTitle">true</item>
@@ -15,6 +15,6 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="NotificationProgress" parent="Theme.Commons" />
+    <style name="NotificationProgress" parent="AppTheme" />
 
 </resources>
\ No newline at end of file
diff --git a/commons/res/values/theme.xml b/commons/res/values/theme.xml
deleted file mode 100644
index 2c82caa31..000000000
--- a/commons/res/values/theme.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.Commons" parent="@style/Theme.Sherlock.Light">
-    <item name="android:actionBarStyle">@style/ActionBar</item>
-	</style>
-
-	<style name="ActionBar" parent="@style/Theme.Sherlock.Light">
-	    <item name="android:background">@drawable/action_bar_translucent</item>
-	</style>
-
-</resources>
\ No newline at end of file