From 6bc2aa035606fa34b226b7b84dcf257b100f38a5 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Fri, 21 Oct 2011 01:24:11 -0500
Subject: [PATCH] Target ICS; use Holo theme where available

---
 AndroidManifest.xml               |  9 ++++-----
 project.properties                |  2 +-
 res/values-v11/untranslatable.xml | 28 ++++++++++++++++++++++++++++
 res/values/untranslatable.xml     | 11 +++++++----
 4 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 res/values-v11/untranslatable.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1a638ae8..0f0c4fc0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,11 +43,11 @@ THE SOFTWARE.
 			android:launchMode="singleTop" />
 		<activity
 			android:name="LibraryActivity"
-			android:launchMode="singleTop"
-			android:theme="@android:style/Theme.Black.NoTitleBar" />
+			android:theme="@style/NoTitle"
+			android:launchMode="singleTop" />
 		<activity
 			android:name="MiniPlaybackActivity"
-			android:theme="@android:style/Theme.Dialog"
+			android:theme="@style/Dialog"
 			android:excludeFromRecents="true"
 			android:launchMode="singleInstance" />
 		<receiver
@@ -99,11 +99,10 @@ THE SOFTWARE.
 			android:name="com.google.android.backup.api_key"
 			android:value="AEdPqrEAAAAIH6Xcxa4hn6sHN1m4jMpi4MFFFMP5sv3XhFuWeA" />
 	</application>
-	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="10" />
+	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="14" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<!-- This is needed for isWiredHeadsetOn() to work in some cases. (bug?) -->
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-	<supports-screens android:smallScreens="true" />
 </manifest>
diff --git a/project.properties b/project.properties
index 0aec9a8c..75b478c9 100644
--- a/project.properties
+++ b/project.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-10
+target=android-14
 proguard.config=proguard.config
diff --git a/res/values-v11/untranslatable.xml b/res/values-v11/untranslatable.xml
new file mode 100644
index 00000000..3e39ae7d
--- /dev/null
+++ b/res/values-v11/untranslatable.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010 Christopher Eby <kreed@kreed.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<resources>
+	<style name="Dialog" parent="android:style/Theme.DeviceDefault.Dialog" />
+	<style name="NoTitle" parent="android:style/Theme.DeviceDefault">
+		<item name="android:windowNoTitle">true</item>
+	</style>
+</resources>
diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index 61a168ba..08ddb01f 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -21,10 +21,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <resources>
-    <style name="NoBackground" parent="android:style/Theme">
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
+	<style name="Dialog" parent="android:style/Theme.Dialog" />
+	<style name="NoTitle" parent="android:style/Theme">
+		<item name="android:windowNoTitle">true</item>
+	</style>
+	<style name="NoBackground" parent="style/NoTitle">
+		<item name="android:windowBackground">@null</item>
+	</style>
 	<string-array name="entry_values">
 		<!-- Note: even if this was an integer-array, these would be converted
 		     to strings anyway.