From ad90d968d80a7f57873d35d701147b5081b297a6 Mon Sep 17 00:00:00 2001
From: Andrew Neal <andrewdneal@gmail.com>
Date: Tue, 20 Nov 2012 18:41:37 -0600
Subject: Play Store changes

---
 AndroidManifest.xml | 428 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 235 insertions(+), 193 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7d17e87..8ff9c96 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,194 +1,236 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.andrew.apollo"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="15" />
-
-    <!-- This is used for Last.fm and Google Music -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- Used to check for a data connection -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- Used to keep the service running when the phone sleeps -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <!-- Stick Broadcast -->
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <!-- Incoming calls -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!-- Used to set ringtone -->
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-
-    <application
-        android:allowTaskReparenting="true"
-        android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:largeHeap="true"
-        android:process=":main"
-        android:taskAffinity="apollo.task.music"
-        android:theme="@android:style/Theme.Holo.Light" >
-        <meta-data
-            android:name="android.app.default_searchable"
-            android:value=".activities.QueryBrowserActivity" />
-        <!-- Serach -->
-        <activity
-            android:name=".activities.QueryBrowserActivity"
-            android:exported="true"
-            android:theme="@android:style/Theme.Holo.Light" >
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-                <action android:name="android.intent.action.MEDIA_SEARCH" />
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-        </activity>
-
-        <!-- Main Activity -->
-        <activity
-            android:name=".activities.MusicLibrary"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="adjustPan" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.MUSIC_PLAYER" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.APP_MUSIC" />
-            </intent-filter>
-        </activity>
-        <!-- Now Playing -->
-        <activity
-            android:name=".activities.AudioPlayerHolder"
-            android:clearTaskOnLaunch="true"
-            android:excludeFromRecents="true"
-            android:label="@string/nowplaying"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan" >
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="content" />
-                <data android:host="media" />
-                <data android:mimeType="audio/*" />
-                <data android:mimeType="application/ogg" />
-                <data android:mimeType="application/x-ogg" />
-                <data android:mimeType="application/itunes" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.andrew.apollo.PLAYBACK_VIEWER" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <!-- Track browser -->
-        <activity
-            android:name=".activities.TracksBrowser"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="adjustPan" >
-            <intent-filter>
-                <action android:name="android.intent.action.EDIT" />
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <!-- Quickly show the queue -->
-        <activity
-            android:name=".activities.QuickQueue"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTop"
-            android:noHistory="true"
-            android:theme="@style/Theme.QuickQueue"
-            android:windowSoftInputMode="stateUnchanged" />
-        <!-- Settings -->
-        <activity
-            android:name=".preferences.SettingsHolder"
-            android:label="@string/settings" />
-        <activity
-            android:name=".menu.PlaylistDialog"
-            android:label="@string/rename_playlist"
-            android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" >
-            <intent-filter>
-                <action android:name="com.andrew.apollo.CREATE_PLAYLIST" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.andrew.apollo.RENAME_PLAYLIST" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".menu.PlaylistPicker"
-            android:icon="@drawable/ic_launcher"
-            android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" >
-            <intent-filter>
-                <action android:name="com.andrew.apollo.ADD_TO_PLAYLIST" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <!-- 1x1 App Widget -->
-        <receiver
-            android:name="com.andrew.apollo.app.widgets.AppWidget11"
-            android:label="@string/apollo_1x1" >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/appwidget1x1_info" />
-        </receiver>
-        <!-- 4x1 App Widget -->
-        <receiver
-            android:name="com.andrew.apollo.app.widgets.AppWidget41"
-            android:label="@string/apollo_4x1" >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/appwidget4x1_info" />
-        </receiver>
-        <!-- 4x2 App Widget -->
-        <receiver
-            android:name="com.andrew.apollo.app.widgets.AppWidget42"
-            android:label="@string/apollo_4x2" >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/appwidget4x2_info" />
-        </receiver>
-        <!-- Media button receiver -->
-        <receiver android:name=".service.MediaButtonIntentReceiver" >
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-                <action android:name="android.media.AUDIO_BECOMING_NOISY" />
-            </intent-filter>
-        </receiver>
-        <!-- Music service -->
-        <service
-            android:name=".service.ApolloService"
-            android:label="@string/app_name"
-            android:process=":main" />
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2012 Andrew Neal
+ 
+  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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.andrew.apollo"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <!-- Gingerbread to Jelly Bean -->
+    <uses-sdk
+        android:minSdkVersion="9"
+        android:targetSdkVersion="17" />
+
+    <!-- Used for caching and creating new playlists -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- Used to check for a network connection -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!-- Used to download images -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Used to keep the service running when the phone sleeps -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <!-- The main service uses a sticky broadcast -->
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+    <!-- Lower or raise the music based on the phone state -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!-- Used to set the devices's ringtone -->
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <!-- Used to create launcher shortcuts -->
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <!-- Used to check if the app is in the background -->
+    <uses-permission android:name="android.permission.GET_TASKS" />
+
+    <application
+        android:name=".ApolloApplication"
+        android:allowBackup="true"
+        android:allowTaskReparenting="true"
+        android:hardwareAccelerated="@bool/config_hardwareAccelerated"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:largeHeap="@bool/config_largeHeap"
+        android:taskAffinity="com.andrew.apollo.task" >
+
+        <!-- Searchable -->
+        <meta-data
+            android:name="android.app.default_searchable"
+            android:value=".ui.activities.SearchActivity" />
+        <!-- Main activity -->
+        <activity
+            android:name=".ui.activities.HomeActivity"
+            android:windowSoftInputMode="adjustPan" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MUSIC_PLAYER" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.APP_MUSIC" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <!-- Now playing -->
+        <activity
+            android:name=".ui.activities.AudioPlayerActivity"
+            android:clearTaskOnLaunch="true"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustPan" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="content" />
+                <data android:host="media" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="application/ogg" />
+                <data android:mimeType="application/x-ogg" />
+                <data android:mimeType="application/itunes" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="file" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="application/ogg" />
+                <data android:mimeType="application/x-ogg" />
+                <data android:mimeType="application/itunes" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="application/ogg" />
+                <data android:mimeType="application/x-ogg" />
+                <data android:mimeType="application/itunes" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.andrew.apollo.AUDIO_PLAYER" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <!-- Profile phone Activity -->
+        <activity
+            android:name=".ui.activities.ProfileActivity"
+            android:excludeFromRecents="true" />
+        <!-- Shortcut launcher Activity -->
+        <activity
+            android:name=".ui.activities.ShortcutActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:theme="@style/Theme.Transparent" >
+            <intent-filter>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <!-- Search interface -->
+        <activity
+            android:name=".ui.activities.SearchActivity"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="android.intent.action.MEDIA_SEARCH" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+        </activity>
+        <!-- Used to set options -->
+        <activity
+            android:name=".ui.activities.SettingsActivity"
+            android:label="@string/menu_settings"
+            android:theme="@style/Apollo.Theme.Dark" />
+        <!-- Themes Activity -->
+        <activity
+            android:name=".ui.activities.ThemesActivity"
+            android:excludeFromRecents="true" />
+        <!-- 4x1 App Widget -->
+        <receiver
+            android:name="com.andrew.apollo.appwidgets.AppWidgetSmall"
+            android:exported="false"
+            android:label="@string/app_widget_small" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/app_widget_small" />
+        </receiver>
+        <!-- 4x2  App Widget -->
+        <receiver
+            android:name="com.andrew.apollo.appwidgets.AppWidgetLarge"
+            android:enabled="@bool/has_honeycomb"
+            android:exported="false"
+            android:label="@string/app_widget_large" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/app_widget_large" />
+        </receiver>
+        <!-- 4x2 alternate App Widget -->
+        <receiver
+            android:name="com.andrew.apollo.appwidgets.AppWidgetLargeAlternate"
+            android:enabled="@bool/has_honeycomb"
+            android:exported="false"
+            android:label="@string/app_widget_large_alt" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/app_widget_large_alternate" />
+        </receiver>
+        <!-- Resizable recently listened App Widget -->
+        <receiver
+            android:name="com.andrew.apollo.appwidgets.RecentWidgetProvider"
+            android:enabled="@bool/has_honeycomb"
+            android:exported="false"
+            android:label="@string/app_widget_recent" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <!-- This specifies the widget provider info -->
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/app_widget_recents" />
+        </receiver>
+        <!-- The service serving the RemoteViews to the recently listened App Widget -->
+        <service
+            android:name="com.andrew.apollo.appwidgets.RecentWidgetService"
+            android:enabled="@bool/has_honeycomb"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <!-- Media button receiver -->
+        <receiver android:name=".MediaButtonIntentReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+                <action android:name="android.media.AUDIO_BECOMING_NOISY" />
+            </intent-filter>
+        </receiver>
+        <!-- Music service -->
+        <service
+            android:name=".MusicPlaybackService"
+            android:label="@string/app_name"
+            android:process=":main" />
+    </application>
+
 </manifest>
\ No newline at end of file
-- 
cgit v1.2.3


From 6677f51d744b6014a7d5bf6a8017a7394025495f Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Sat, 23 Feb 2013 13:19:00 +0100
Subject: Make Apollo compile and adapt to min API level 14 (ICS).

Change-Id: I6aa5288c5f72f6c79e1a51efb82c894b206b94e6
---
 AndroidManifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8ff9c96..51ed499 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,9 +19,9 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <!-- Gingerbread to Jelly Bean -->
+    <!-- ICS to Jelly Bean -->
     <uses-sdk
-        android:minSdkVersion="9"
+        android:minSdkVersion="14"
         android:targetSdkVersion="17" />
 
     <!-- Used for caching and creating new playlists -->
@@ -233,4 +233,4 @@
             android:process=":main" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
-- 
cgit v1.2.3


From d5b9b0e224b96e811686704d78322f202054607a Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Sat, 23 Feb 2013 13:29:12 +0100
Subject: Remove remainders of pre-ICS support.

Change-Id: I9f5bdde528fd67eee2dea61791cbf2c492446392
---
 AndroidManifest.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 51ed499..ca4a96b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -175,7 +175,6 @@
         <!-- 4x2  App Widget -->
         <receiver
             android:name="com.andrew.apollo.appwidgets.AppWidgetLarge"
-            android:enabled="@bool/has_honeycomb"
             android:exported="false"
             android:label="@string/app_widget_large" >
             <intent-filter>
@@ -189,7 +188,6 @@
         <!-- 4x2 alternate App Widget -->
         <receiver
             android:name="com.andrew.apollo.appwidgets.AppWidgetLargeAlternate"
-            android:enabled="@bool/has_honeycomb"
             android:exported="false"
             android:label="@string/app_widget_large_alt" >
             <intent-filter>
@@ -203,7 +201,6 @@
         <!-- Resizable recently listened App Widget -->
         <receiver
             android:name="com.andrew.apollo.appwidgets.RecentWidgetProvider"
-            android:enabled="@bool/has_honeycomb"
             android:exported="false"
             android:label="@string/app_widget_recent" >
             <intent-filter>
@@ -217,7 +214,6 @@
         <!-- The service serving the RemoteViews to the recently listened App Widget -->
         <service
             android:name="com.andrew.apollo.appwidgets.RecentWidgetService"
-            android:enabled="@bool/has_honeycomb"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
         <!-- Media button receiver -->
         <receiver android:name=".MediaButtonIntentReceiver" >
-- 
cgit v1.2.3


From 1ad22a3ff979c349d80add0f56eaa888421aec75 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Sun, 24 Feb 2013 13:32:05 +0100
Subject: Bump version number to 1.1.

Change-Id: Id0a89bea98b60f96327d262ba10d9b936ba91f17
---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca4a96b..30876b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.andrew.apollo"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="2"
+    android:versionName="1.1" >
 
     <!-- ICS to Jelly Bean -->
     <uses-sdk
-- 
cgit v1.2.3