merged everything together correctly

This commit is contained in:
Karim Abou Zeid 2015-04-17 01:39:41 +02:00
commit 70f33b4829
263 changed files with 2932 additions and 2411 deletions

View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.kabouzeid.gramophone" >
xmlns:tools="http://schemas.android.com/tools"
package="com.kabouzeid.gramophone">
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@ -12,10 +13,13 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.MaterialMusic.Light" >
android:theme="@style/Theme.MaterialMusic.Light"
android:supportsRtl="true"
tools:ignore="UnusedAttribute">
<activity
android:name=".ui.activities.MainActivity"
android:label="@string/app_name" >
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MUSIC_PLAYER" />
@ -75,26 +79,24 @@
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.PICK" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.OPENABLE" />
<data android:mimeType="vnd.android.cursor.dir/audio"/>
<data android:mimeType="vnd.android.cursor.dir/audio" />
</intent-filter>
</activity>
<activity android:name=".ui.activities.AlbumDetailActivity" >
</activity>
<activity android:name=".ui.activities.ArtistDetailActivity" >
</activity>
<activity android:name=".ui.activities.AlbumDetailActivity" />
<activity android:name=".ui.activities.ArtistDetailActivity" />
<activity
android:name=".ui.activities.MusicControllerActivity"
android:parentActivityName=".ui.activities.MainActivity" >
</activity>
android:parentActivityName=".ui.activities.MainActivity" />
<service
android:name=".service.MusicService"
android:enabled="true" >
</service>
android:enabled="true" />
<receiver android:name=".service.MediaButtonIntentReceiver" >
<receiver android:name=".service.MediaButtonIntentReceiver">
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
@ -107,18 +109,15 @@
<activity
android:name=".ui.activities.tageditor.SongTagEditorActivity"
android:label="@string/title_activity_tag_editor"
android:windowSoftInputMode="adjustResize" >
</activity>
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.activities.tageditor.AlbumTagEditorActivity"
android:label="@string/title_activity_album_tag_editor" >
</activity>
android:label="@string/title_activity_album_tag_editor" />
<activity
android:name=".ui.activities.SearchActivity"
android:label="@string/title_activity_search" >
</activity>
android:label="@string/title_activity_search" />
<receiver android:name=".appwidget.MusicPlayerWidget" >
<receiver android:name=".appwidget.MusicPlayerWidget">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
@ -130,12 +129,11 @@
<activity
android:name=".ui.activities.PlaylistDetailActivity"
android:label="@string/title_activity_playlist_detail" >
</activity>
android:label="@string/title_activity_playlist_detail" />
<activity
android:name=".ui.activities.SettingsActivity"
android:label="@string/title_activity_settings" >
</activity>
android:label="@string/title_activity_settings" />
</application>
</manifest>