1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/app/src/main/AndroidManifest.xml	Mon Apr 20 17:11:10 2015 +0300
     1.3 @@ -0,0 +1,33 @@
     1.4 +<?xml version="1.0" encoding="utf-8"?>
     1.5 +<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     1.6 +    package="com.example.friendstream.friendstream" >
     1.7 +
     1.8 +    <!--allows music to play in the background, after Activity view switched out -->
     1.9 +    <uses-permission android:name="android.permission.WAKE_LOCK" />
    1.10 +
    1.11 +    <!--Generated by Android Studio -->
    1.12 +    <application
    1.13 +        android:allowBackup="true"
    1.14 +        android:icon="@mipmap/ic_launcher"
    1.15 +        android:label="@string/app_name"
    1.16 +        android:theme="@style/AppTheme" >
    1.17 +        <activity
    1.18 +            android:name=".PickingSongs"
    1.19 +            android:configChanges="orientation|keyboardHidden|screenSize"
    1.20 +            android:label="@string/app_name"
    1.21 +            android:theme="@style/FullscreenTheme" >
    1.22 +            <intent-filter>
    1.23 +                <action android:name="android.intent.action.MAIN" />
    1.24 +
    1.25 +                <category android:name="android.intent.category.LAUNCHER" />
    1.26 +            </intent-filter>
    1.27 +        </activity>
    1.28 +
    1.29 +        <service
    1.30 +            android:name=".MusicService"
    1.31 +            android:enabled="true"
    1.32 +            android:exported="true" >
    1.33 +        </service>
    1.34 +    </application>
    1.35 +
    1.36 +</manifest>