Merge remote-tracking branch 'github/master' into HEAD

Change-Id: If25d2cdeb0a2a912faff62f95a0d282cbdb33b4c

1 files changed, 232 insertions, 216 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b8c4989..30876b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,216 +1,232 @@
-<?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" />

-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

-

-    <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>

-        <!-- Play External File -->

-        <activity

-            android:name=".activities.PlayExternal"

-            android:clearTaskOnLaunch="true"

-            android:excludeFromRecents="true"

-            android:noHistory="true"

-            android:launchMode="singleTask"

-            android:theme="@style/Theme.Light.Translucent"

-            android:label="@string/app_name" >

-            <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>

-        </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>

-

-</manifest>

+<?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="2"
+    android:versionName="1.1" >
+
+    <!-- ICS to Jelly Bean -->
+    <uses-sdk
+        android:minSdkVersion="14"
+        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: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: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: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: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>