From 64e9bb854e1d4635c9b5c6ed3f8f70470fe777fb Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 27 Apr 2011 23:28:48 -0700
Subject: [PATCH] Fix for Astrid not displaying properly in Android 1.6 because
 of using Theme.Wallpaper, which is only exposed in API version 5

---
 astrid/AndroidManifest.xml                    |   4 +-
 .../astrid/activity/EditPreferences.java      |   2 +
 .../GreenDroid/res/values-v5/gd_themes.xml    | 108 ++++++++++++++++++
 .../GreenDroid/res/values/gd_themes.xml       |   2 +-
 4 files changed, 113 insertions(+), 3 deletions(-)
 create mode 100644 greendroid/GreenDroid/res/values-v5/gd_themes.xml

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index f7f352f1b..04e5a2151 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="3.7.3"
-          android:versionCode="175">
+          android:versionName="3.7.3.1"
+          android:versionCode="176">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index bd46a9cb9..2b5c962e1 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -227,6 +227,8 @@ public class EditPreferences extends TodorooPreferences {
                 Flags.set(Flags.REFRESH);
             }
         } else if (r.getString(R.string.p_transparent).equals(preference.getKey())) {
+            if(AndroidUtilities.getSdkVersion() < 5)
+                preference.setEnabled(false);
             if (value != null && !(Boolean)value)
                 preference.setSummary(R.string.EPr_transparent_desc_disabled);
             else
diff --git a/greendroid/GreenDroid/res/values-v5/gd_themes.xml b/greendroid/GreenDroid/res/values-v5/gd_themes.xml
new file mode 100644
index 000000000..afda6e372
--- /dev/null
+++ b/greendroid/GreenDroid/res/values-v5/gd_themes.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2010 Cyril Mottier (http://www.cyrilmottier.com)
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+
+    <style name="Theme.GreenDroid" parent="@android:style/Theme.Wallpaper">
+    
+        <item name="gdTextAppearance">@style/TextAppearance</item>
+        <item name="gdTextAppearanceLarge">@style/TextAppearance.Large</item>
+        <item name="gdTextAppearanceMedium">@style/TextAppearance.Medium</item>
+        <item name="gdTextAppearanceSmall">@style/TextAppearance.Small</item>
+        <item name="gdTextAppearanceSeparator">@style/TextAppearance.Separator</item>
+        
+        <item name="gdDrawableWidth">@dimen/gd_drawable_width</item>
+        <item name="gdDrawableHeight">@dimen/gd_drawable_height</item>
+        <item name="gdDrawableMargin">@dimen/gd_drawable_margin</item>
+        
+        <item name="gdProgressBarWidth">@dimen/gd_progress_bar_width</item>
+        <item name="gdProgressBarHeight">@dimen/gd_progress_bar_height</item>
+        <item name="gdProgressBarMargin">@dimen/gd_progress_bar_margin</item>
+        
+        <item name="gdItemViewPreferredHeight">@dimen/gd_item_view_height</item>
+        <item name="gdItemViewPreferredHalfHeight">@dimen/gd_item_view_half_height</item>
+        <item name="gdItemViewPreferredPaddingLeft">@dimen/gd_item_view_padding_left</item>
+        <item name="gdSeparatorItemViewPreferredHeight">@dimen/gd_separator_item_view_height</item>
+        
+        <item name="gdTextItemViewStyle">@style/GreenDroid.TextItemView</item>
+        <item name="gdLongTextItemViewStyle">@style/GreenDroid.LongTextItemView</item>
+        <item name="gdDescriptionItemViewStyle">@style/GreenDroid.DescriptionItemView</item>
+        
+        <item name="gdSeparatorItemViewStyle">@style/GreenDroid.SeparatorItemView</item>
+        
+       	<item name="gdProgressItemViewStyle">@style/GreenDroid.ProgressItemView</item>
+	 	<item name="gdProgressItemViewStyleText">@style/GreenDroid.ProgressItemView.Text</item>
+	 	<item name="gdProgressItemViewStyleProgressBar">@style/GreenDroid.ProgressItemView.ProgressBar</item>
+	 	
+	 	<item name="gdDrawableItemViewStyle">@style/GreenDroid.DrawableItemView</item>
+	 	<item name="gdDrawableItemViewStyleText">@style/GreenDroid.DrawableItemView.Text</item>
+	 	<item name="gdDrawableItemViewStyleDrawable">@style/GreenDroid.DrawableItemView.Drawable</item>
+        
+        <item name="gdSubtitleItemViewStyle">@style/GreenDroid.SubtitleItemView</item>
+        <item name="gdSubtitleItemViewStyleText">@style/GreenDroid.SubtitleItemView.Text</item>
+        <item name="gdSubtitleItemViewStyleSubtitle">@style/GreenDroid.SubtitleItemView.Subtitle</item>
+        
+        <item name="gdSubtextItemViewStyle">@style/GreenDroid.SubtextItemView</item>
+        <item name="gdSubtextItemViewStyleText">@style/GreenDroid.SubtextItemView.Text</item>
+        <item name="gdSubtextItemViewStyleSubtext">@style/GreenDroid.SubtextItemView.Subtext</item>
+        
+        <item name="gdThumbnailItemViewStyle">@style/GreenDroid.ThumbnailItemView</item>
+        <item name="gdThumbnailItemViewStyleText">@style/GreenDroid.ThumbnailItemView.Text</item>
+        <item name="gdThumbnailItemViewStyleSubtitle">@style/GreenDroid.ThumbnailItemView.Subtitle</item>
+        <item name="gdThumbnailItemViewStyleThumbnail">@style/GreenDroid.ThumbnailItemView.Thumbnail</item>
+        
+        <item name="gdSegmentTextColor">@android:color/black</item>
+        <item name="gdSegmentTextSize">14sp</item>
+        <item name="gdSegmentBackground">@drawable/gd_segment_label</item>
+        <item name="gdSegmentCheckmark">@drawable/gd_segment_checkmark</item>
+        <item name="gdSegmentedBarStyle">@style/GreenDroid.SegmentedBar</item>
+        <item name="gdSegmentedHostStyle">@style/GreenDroid.SegmentedHost</item>
+        
+		<item name="gdActionBarTitleColor">@android:color/white</item>
+		<item name="gdActionBarBackground">@color/gd_action_bar_tint</item>
+		<item name="gdActionBarItemBackground">@drawable/gd_action_bar_item</item>
+		<item name="gdActionBarDividerDrawable">@color/gd_action_bar_divider_tint</item>
+		<item name="gdActionBarDividerWidth">1px</item>
+		<item name="gdActionBarApplicationDrawable">@null</item>
+		<item name="gdActionBarHomeDrawable">@drawable/gd_action_bar_home</item>
+		
+		<item name="gdActionBarStyle">@style/GreenDroid.Widget.ActionBar</item>
+		<item name="gdActionBarTitleStyle">@style/GreenDroid.Widget.ActionBar.Title</item>
+		<item name="gdActionBarItemStyle">@style/GreenDroid.Widget.ActionBar.Item</item>
+		
+		<item name="gdTabIndicatorHeight">38dp</item>
+        <item name="gdTabIndicatorTextAppearance">@style/TextAppearance.TabIndicator</item>
+        <item name="gdTabIndicatorBackground">@drawable/gd_tab_indicator</item>
+        
+        <item name="gdQuickActionBarStyle">@style/GreenDroid.Widget.QuickAction.Bar</item>
+        <item name="gdQuickActionBarItemStyle">@style/GreenDroid.Widget.QuickAction.Bar.Item</item>
+        <item name="gdQuickActionGridStyle">@style/GreenDroid.Widget.QuickAction.Grid</item>
+        <item name="gdQuickActionGridItemStyle">@style/GreenDroid.Widget.QuickAction.Grid.Item</item>
+        
+    </style>
+    
+    
+    <style name="Theme.GreenDroid.NoTitleBar" parent="@style/Theme.GreenDroid">
+    
+    	<item name="android:windowContentOverlay">@null</item>
+    	<item name="android:windowNoTitle">true</item>
+    	
+    </style>
+    
+</resources>
\ No newline at end of file
diff --git a/greendroid/GreenDroid/res/values/gd_themes.xml b/greendroid/GreenDroid/res/values/gd_themes.xml
index afda6e372..11b7e814b 100644
--- a/greendroid/GreenDroid/res/values/gd_themes.xml
+++ b/greendroid/GreenDroid/res/values/gd_themes.xml
@@ -19,7 +19,7 @@
 
 <resources>
 
-    <style name="Theme.GreenDroid" parent="@android:style/Theme.Wallpaper">
+    <style name="Theme.GreenDroid" parent="@android:style/Theme">
     
         <item name="gdTextAppearance">@style/TextAppearance</item>
         <item name="gdTextAppearanceLarge">@style/TextAppearance.Large</item>