alpha 0.0.2

[DHBWCampusApp.git] / app / src / main / AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89c3c048b60981ec84203a213d5687cd13b02ee6..54385a9476b9c96af0008528bd2052ad21ab7e5f 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,9 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <uses-feature
         android:name="android.hardware.nfc"
@@ -19,7 +21,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".CampusApp"
-            android:label="@string/app_name"
+            android:label="@string/app_name_launcher"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -27,14 +29,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings"
-            android:parentActivityName=".CampusApp">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.dhbwloe.campusapp.CampusApp" />
-        </activity>
     </application>
 
 </manifest>