Remove dark theme

astrid/src/main/AndroidManifest.xml

@@ -200,12 +200,6 @@
                 android:resource="@xml/scrollable_widget_provider_info" />
         </receiver>
 
-        <receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver">
-            <intent-filter>
-                <action android:name="org.tasks.FLUSH_DETAILS" />
-            </intent-filter>
-        </receiver>
-
         <receiver android:name="com.todoroo.astrid.calls.PhoneStateChangedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PHONE_STATE" />
@@ -304,7 +298,7 @@
 
         <activity
             android:name="com.todoroo.astrid.core.CustomFilterActivity"
-            android:theme="@style/Tasks.Dialog" />
+            android:theme="@style/Tasks.Dialog.Light" />
 
         <activity
             android:name="com.todoroo.astrid.core.CustomFilterExposer$DeleteActivity"
@@ -339,7 +333,7 @@
         <activity
             android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
             android:windowSoftInputMode="stateHidden"
-            android:theme="@style/Tasks.Dialog" />
+            android:theme="@style/Tasks.Dialog.Light" />
 
         <!-- gtasks -->
         <activity

astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java

@@ -344,8 +344,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
     }
 
     public void addPreferenceListeners() {
-        findPreference(getString(R.string.p_use_dark_theme)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
-
         findPreference(getString(R.string.p_fontSize)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
 
         findPreference(getString(R.string.p_use_dark_theme_widget)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -274,7 +274,7 @@ public class RepeatControlSet extends PopupControlSet {
             checkBox.setButtonDrawable(R.drawable.btn_check_small);
 
             TextView label = new TextView(activity);
-            label.setTextAppearance(activity, R.style.TextAppearance_GEN_EditLabel);
+            label.setTextAppearance(activity, R.style.TextAppearance);
             label.setLayoutParams(textLp);
             label.setTextSize(14);
             label.setText(dfs.getShortWeekdays()[dayOfWeek].substring(0, 1));

astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java

@@ -46,8 +46,6 @@ public class AstridDefaultPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_calendar_reminders, true);
 
-        setPreference(prefs, editor, r, R.string.p_use_dark_theme, false);
-
         setPreference(prefs, editor, r, R.string.p_show_task_edit_comments, true);
 
         setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false);

astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java

@@ -32,11 +32,11 @@ public class ActivityPreferences extends Preferences {
     }
 
     public void applyTheme() {
-        applyTheme(isDarkTheme() ? R.style.Tasks : R.style.Tasks_Light);
+        applyTheme(R.style.Tasks);
     }
 
     public void applyDialogTheme() {
-        applyTheme(isDarkTheme() ? R.style.Tasks_Dialog : R.style.Tasks_Dialog_Light);
+        applyTheme(R.style.Tasks_Dialog_Light);
     }
 
     public void applyTranslucentDialogTheme() {
@@ -50,22 +50,7 @@ public class ActivityPreferences extends Preferences {
 
     public int getEditDialogTheme() {
         boolean ics = AndroidUtilities.getSdkVersion() >= 14;
-        int themeSetting = getBoolean(R.string.p_use_dark_theme, false) ? R.style.Tasks : R.style.Tasks_Light;
-        int theme;
-        if (themeSetting == R.style.Tasks) {
-            if (ics) {
-                theme = R.style.TEA_Dialog_ICS;
-            } else {
-                theme = R.style.TEA_Dialog;
-            }
-        } else {
-            if (ics) {
-                theme = R.style.TEA_Dialog_Light_ICS;
-            } else {
-                theme = R.style.TEA_Dialog_Light;
-            }
-        }
-        return theme;
+        return ics ? R.style.TEA_Dialog_Light_ICS : R.style.TEA_Dialog_Light;
     }
 
     /**

astrid/src/main/java/org/tasks/preferences/Preferences.java

@@ -208,10 +208,6 @@ public class Preferences {
         }
     }
 
-    public boolean isDarkTheme() {
-        return getBoolean(R.string.p_use_dark_theme, false);
-    }
-
     public boolean isDarkWidgetTheme() {
         return getBoolean(R.string.p_use_dark_theme_widget, false);
     }

astrid/src/main/res/drawable/importance_background_selected_dark.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid
-      android:color="#111"/>
-  <corners
-    android:radius="4dp" />
-  <size android:width="40dip"
-        android:height="40dip"/>
-</shape>

astrid/src/main/res/layout/alarm_edit_row.xml

@@ -33,7 +33,7 @@
 	        android:layout_weight="100"
 	        android:paddingTop="15dip"
 	        android:paddingBottom="15dip"
-	        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+	        style="@style/TextAppearance"/>
 	        
 	    <ImageButton android:id="@+id/button1"
 	        android:background="@drawable/btn_dismiss"

astrid/src/main/res/layout/control_set_alarms.xml

@@ -17,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/alarm_ACS_label"
-            style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
+            style="@style/TextAppearance" />
   <LinearLayout android:id="@+id/alert_container"
       android:paddingLeft="5dip"
                 android:orientation="vertical"
@@ -41,7 +41,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/alarm_ACS_button"
-            style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
+            style="@style/TextAppearance" />
   </LinearLayout>
 </LinearLayout>
 

astrid/src/main/res/layout/control_set_reminders.xml

@@ -29,16 +29,16 @@
 		        android:paddingLeft="10dip"
 		        android:text="@string/TEA_reminder_label"
 		        android:paddingTop="10dip"
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
+		        style="@style/TextAppearance" />
 		      <CheckBox
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" 
+		        style="@style/TextAppearance"
 		        android:id="@+id/reminder_due"
 		        android:layout_width="fill_parent"
 		        android:layout_height="wrap_content"
 		        android:layout_marginLeft="10dip"   
 		        android:text="@string/TEA_reminder_due" />
 		      <CheckBox
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" 
+		        style="@style/TextAppearance"
 		        android:id="@+id/reminder_overdue"
 		        android:layout_width="fill_parent"
 		        android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
 		        android:layout_width="fill_parent"
 		        android:layout_height="fill_parent">
 		        <CheckBox
-		          style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"   
+		          style="@style/TextAppearance"
 		          android:id="@+id/reminder_random"
 		          android:layout_width="wrap_content"
 		          android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
 			        android:layout_width="wrap_content"
 			        android:layout_height="wrap_content"
 			        android:text="@string/TEA_reminder_alarm_label"
-			        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
+			        style="@style/TextAppearance" />
 			      <TextView
 		             android:id="@+id/reminder_alarm_display"
 		             android:layout_width="fill_parent"

astrid/src/main/res/layout/control_set_timers.xml

@@ -24,7 +24,7 @@
 	      android:layout_width="wrap_content"
 	      android:layout_height="wrap_content"
 	      android:text="@string/TEA_estimatedDuration_label"
-	      style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
+	      style="@style/TextAppearance" />
 	    <TextView
              android:id="@+id/estimatedDuration"
              android:layout_width="fill_parent"
@@ -51,7 +51,7 @@
 	      android:layout_width="wrap_content"
 	      android:layout_height="wrap_content"
 	      android:text="@string/TEA_elapsedDuration_label"
-	      style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
+	      style="@style/TextAppearance" />
 	    <TextView
              android:id="@+id/elapsedDuration"
              android:layout_width="fill_parent"

astrid/src/main/res/layout/sort_selection_dialog.xml

@@ -69,7 +69,7 @@
           android:layout_height="1px" />
 
       <TextView
-          style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+          style="@style/TextAppearance"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:paddingTop="10dip"

astrid/src/main/res/values-v11/styles.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AstridActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="android:displayOptions">showHome|showTitle</item>
+        <item name="android:background">@drawable/header_day_blue</item>
+    </style>
+
+    <style name="AstridActionBarStyle.Dialog">
+        <item name="android:background">@drawable/header_background</item>
+        <item name="android:displayOptions">showHome|showTitle</item>
+    </style>
+
+    <style name="AstridActionBarStyle.Dialog.Light">
+        <item name="android:background">@android:color/white</item>
+        <item name="android:displayOptions">showHome|showTitle</item>
+    </style>
+
+    <style name="TEA_Dialog_ICS" parent="@android:style/Theme.Holo.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="asTextColor">#ffffff</item>
+    </style>
+
+    <style name="TEA_Dialog_Light_ICS" parent="@android:style/Theme.Holo.Light.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="asTextColor">#000000</item>
+    </style>
+
+</resources>

astrid/src/main/res/values/keys.xml

@@ -260,7 +260,6 @@
   <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
   <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
   <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string>
-    <string name="p_use_dark_theme">use_dark_theme</string>
     <string name="p_use_dark_theme_widget">use_dark_theme_widget</string>
     <string name="p_debug_logging">debug_logging</string>
     <!-- Deprecated -->

astrid/src/main/res/values/strings-core.xml

@@ -428,10 +428,7 @@
 
   <!-- slide 30i: Preference Category: Appearance Title -->
   <string name="EPr_appearance_header">Appearance</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
-  
+
   <!-- slide 34a: Preference: Task List Font Size Title -->
   <string name="EPr_fontSize_title">Task list size</string>
   
@@ -469,9 +466,6 @@
   <!-- slide 34h -->
   <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
 
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
   <!-- Preference: task edit comments -->
   <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
   

astrid/src/main/res/values/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="EPr_use_dark_theme">Dark theme</string>
     <string name="EPr_use_dark_theme_widget">Dark widget theme</string>
     <string name="delete_task">Delete task</string>
     <string name="TLA_menu_support">Support</string>

astrid/src/main/res/values/styles.xml

@@ -8,78 +8,28 @@
 
     <!-- ========================================================== General  -->
     
-    <style name="Tasks" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="asContentBackground">@android:color/black</item>
-        <item name="asTextColor">#ffffff</item>
-        <item name="asTextColorInverse">#000000</item>
-        <item name="asDetailsColor">#777777</item>
-        <item name="asDueDateColor">#878787</item>
-        <item name="asDueDateOverdueColor">#ee5555</item>
-        <item name="asDueDateCompletedColor">#ff777777</item>
-        <item name="asSeparatorBackground">#888888</item>
-        <item name="asListDividerColor">#555555</item>
-        <item name="asEditTextBackground">@null</item>
-        <item name="asEditBackground">#101010</item>
-        <item name="asEditRowBackground">@drawable/task_edit_background</item>
-        <item name="asThemeTextColor">@color/blue_theme_color</item>
-        <item name="asAbBackgroundColor">#000000</item>
-        <item name="asFilterSelectedIcon">@drawable/filter_selected_icon</item>
-        <item name="asTaskRowSelector">@drawable/task_row_bg_dark</item>
-        <item name="ic_action_add">@drawable/ic_action_add_light</item>
-        <item name="ic_action_new_attachment">@drawable/ic_action_new_attachment_light</item>
-        <item name="ic_action_discard">@drawable/ic_action_discard_light</item>
-        <item name="ic_action_save">@drawable/ic_action_save_light</item>
-        <item name="ic_action_cancel">@drawable/ic_action_cancel_light</item>
-        <item name="ic_action_camera">@drawable/ic_action_camera_light</item>
-        <item name="ic_action_mic">@drawable/ic_action_mic_light</item>
-        <item name="ic_action_search">@drawable/ic_action_search_light</item>
-        <item name="ic_drawer">@drawable/ic_drawer_light</item>
-        <item name="task_edit_theme_color">@color/blue_theme_color</item>
-        <item name="importance_background_selected">@drawable/importance_background_selected_dark</item>
-        <item name="tea_icn_files">@drawable/tea_icn_files_lightblue</item>
-        <item name="tea_icn_addcal">@drawable/tea_icn_addcal_lightblue</item>
-        <item name="tea_icn_lists">@drawable/tea_icn_lists_lightblue</item>
-        <item name="tea_icn_timer">@drawable/tea_icn_timer_lightblue</item>
-        <item name="tea_icn_date">@drawable/tea_icn_date_lightblue</item>
-        <item name="tea_icn_edit">@drawable/tea_icn_edit_lightblue</item>
-        <item name="tea_icn_hide">@drawable/tea_icn_hide_lightblue</item>
-        <item name="tea_icn_reminder">@drawable/tea_icn_reminder_lightblue</item>
-        <item name="drawer_background">#303030</item>
-        <item name="drawer_text">#ffffff</item>
-        <item name="drawer_selected">#555555</item>
-        <!-- actionbar-styling -->
-        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle</item>
-        <item name="actionBarStyle">@style/AstridActionBarStyle</item>
-        <item name="android:actionOverflowButtonStyle">@style/AstridOverflowStyle</item>
-        <item name="actionOverflowButtonStyle">@style/AstridOverflowStyle</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
     <style name="ActionBarPopupThemeOverlay" parent="Widget.AppCompat.Light.PopupMenu" />
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
     </style>
 
-    <style name="AstridV11ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="android:background">@drawable/header_blue</item>
-        <item name="android:displayOptions">showHome|showTitle</item>
-    </style>
-    
     <style name="AstridActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="background">@drawable/header_blue</item>
         <item name="displayOptions">showHome|showTitle</item>
+        <item name="background">@drawable/header_day_blue</item>
     </style>
 
     <style name="AstridOverflowStyle" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_action_overflow_light</item>
+        <item name="android:src">@drawable/ic_action_overflow</item>
     </style>
 
-    <style name="Tasks.Light" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="Tasks" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@null</item>
+        <item name="asDueDateOverdueColor">#ee5555</item>
+        <item name="asDueDateCompletedColor">#ff777777</item>
+        <item name="asSeparatorBackground">#888888</item>
+        <item name="asEditTextBackground">@null</item>
+
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="asContentBackground">@android:color/white</item>
@@ -124,27 +74,13 @@
 
         <!-- actionbar-styling -->
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Light</item>
-        <item name="actionBarStyle">@style/AstridActionBarStyle.Light</item>
-        <item name="android:actionOverflowButtonStyle">@style/AstridOverflowStyle.Light</item>
-        <item name="actionOverflowButtonStyle">@style/AstridOverflowStyle.Light</item>
+        <item name="android:actionBarStyle">@style/AstridActionBarStyle</item>
+        <item name="actionBarStyle">@style/AstridActionBarStyle</item>
+        <item name="android:actionOverflowButtonStyle">@style/AstridOverflowStyle</item>
+        <item name="actionOverflowButtonStyle">@style/AstridOverflowStyle</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="AstridV11ActionBarStyle.Light">
-        <item name="android:displayOptions">showHome|showTitle</item>
-        <item name="android:background">@drawable/header_day_blue</item>
-    </style>
-    
-    <style name="AstridActionBarStyle.Light">
-        <item name="displayOptions">showHome|showTitle</item>
-        <item name="background">@drawable/header_day_blue</item>
-    </style>
-
-    <style name="AstridOverflowStyle.Light" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_action_overflow</item>
-    </style>
-
     <style name="Tasks.FullTransparent" parent="@style/Theme.AppCompat">
         <item name="android:windowIsTranslucent">true</item>
 	    <item name="android:windowBackground">@android:color/transparent</item>
@@ -152,65 +88,43 @@
 	    <item name="android:windowIsFloating">true</item>
 	</style>
 
-    <style name="Tasks.Dialog" parent="@android:style/Theme.Dialog">
+    <style name="AstridActionBarStyle.Dialog">
+        <item name="background">@drawable/header_background</item>
+        <item name="displayOptions">showHome|showTitle</item>
+    </style>
+    
+    <style name="Tasks.Dialog.Light" parent="@android:style/Theme.Dialog">
         <!--<item name="android:windowBackground">@null</item>-->
-        <item name="asContentBackground">@android:color/black</item>
-        <item name="asTextColor">#ffffffff</item>
-        <item name="asDetailsColor">#ff777777</item>
-        <item name="asDueDateColor">#ff7777aa</item>
         <item name="asDueDateOverdueColor">#ffee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
         <item name="asSeparatorBackground">#888888</item>
-        <!-- actionbar-styling -->
-        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Dialog</item>
-        <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog</item>
-        
+
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowBackground">@drawable/panel_background</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
         <item name="android:layout_width">fill_parent</item>
-        
+
         <item name="android:windowTitleSize">18dip</item>
         <item name="android:windowTitleStyle">@style/DialogTitle</item>
         <item name="android:windowTitleBackgroundStyle">@style/DialogTitle</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
-        
+
         <item name="windowActionBar">false</item>
-        <item name="asEditBackground">#101010</item>
-        <item name="asEditRowBackground">@drawable/task_edit_background</item>
-        <item name="asThemeTextColor">@color/blue_theme_color</item>
-    </style>
-    
-    <style name="AstridV11ActionBarStyle.Dialog">
-        <item name="android:background">@drawable/header_background</item>
-        <item name="android:displayOptions">showHome|showTitle</item>
-    </style>
-    
-    <style name="AstridActionBarStyle.Dialog">
-        <item name="background">@drawable/header_background</item>
-        <item name="displayOptions">showHome|showTitle</item>
-    </style>
-    
-    <style name="Tasks.Dialog.Light">
+
         <item name="asContentBackground">@android:color/white</item>
         <item name="asTextColor">#ff000000</item>
         <item name="asDetailsColor">#ff6666aa</item>
         <item name="asDueDateColor">#878787</item>
         <!-- actionbar-styling -->
-        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Dialog.Light</item>
+        <item name="android:actionBarStyle">@style/AstridActionBarStyle.Dialog.Light</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog.Light</item>
         
         <item name="asEditBackground">#dddddd</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
-    
-    <style name="AstridV11ActionBarStyle.Dialog.Light">
-        <item name="android:background">@android:color/white</item>
-        <item name="android:displayOptions">showHome|showTitle</item>
-    </style>
-    
+
     <style name="AstridActionBarStyle.Dialog.Light">
         <item name="background">@android:color/white</item>
         <item name="displayOptions">showHome|showTitle</item>
@@ -230,12 +144,6 @@
         <item name="android:textColor">?attr/asTextColor</item>    
     </style>
     
-    <!-- generic style for labels above edit boxes -->
-    <style name="TextAppearance.GEN_EditLabel">
-        <!-- <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item> -->
-    </style>
-    
     <!--================================================== Custom Dialogs == -->
     
      <style name="DialogTitle">
@@ -288,9 +196,6 @@
    	    <item name="android:textColor">?attr/asThemeTextColor</item>
    	</style>
 
-    <style name="TextAppearance.GEN_EditLabel.DLG_EditLabel">
-    </style>
-
    	<style name="TEA_Dialog" parent="@android:style/Theme.Dialog">
 	    <item name="android:windowFrame">@null</item>
 	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
@@ -305,25 +210,7 @@
    	    <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
    	    <item name="asTextColor">#000000</item>
    	</style>
-   	
-   	<style name="TEA_Dialog_ICS" parent="@android:style/Theme.Holo.Dialog">
-	    <item name="android:windowFrame">@null</item>
-	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-	    <item name="android:windowIsFloating">true</item>
-	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-	    <item name="asTextColor">#ffffff</item>   	    
-   	</style>
 
-    <style name="TEA_Dialog_Light_ICS" parent="@android:style/Theme.Holo.Light.Dialog">
-	    <item name="android:windowFrame">@null</item>
-	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-	    <item name="android:windowIsFloating">true</item>
-	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-	    <item name="asTextColor">#000000</item>   	    
-   	</style>
-	
     <style name="TEA_DialogWindowTitle">
         <item name="android:maxLines">1</item>
         <item name="android:scrollHorizontally">true</item>

astrid/src/main/res/xml/preferences.xml

@@ -9,13 +9,7 @@
     android:title="@string/EPr_title">
 
     <PreferenceScreen
-        android:title="@string/EPr_appearance_header"
-        android:summary="@string/EPr_appearance_summary">
-
-        <CheckBoxPreference
-            android:title="@string/EPr_use_dark_theme"
-            android:key="@string/p_use_dark_theme"
-            android:defaultValue="false"/>
+        android:title="@string/EPr_appearance_header">
 
         <CheckBoxPreference
             android:title="@string/EPr_use_dark_theme_widget"