Updated Gradle config for Android Studio 1.0

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2c5f3c8ddcc471decfec466a4bbf1775396abdb8..b6b4a4e32c85b6c5abc146a98ed69f843103349e 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,13 +2,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.me.njae.sunshine" >
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".MainActivity"
+            android:name="uk.me.njae.sunshine.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -16,6 +18,25 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="uk.me.njae.sunshine.DetailActivity"
+            android:label="@string/title_activity_detail"
+            android:parentActivityName=".MainActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="uk.me.njae.sunshine.MainActivity" />
+        </activity>
+        <activity
+            android:name="uk.me.njae.sunshine.SettingsActivity"
+            android:label="@string/title_activity_settings"
+            android:parentActivityName=".MainActivity" >
+            <meta-data
+                android:name="android:support.PARENT_ACTIVITY"
+                android:value="MainActivity" />
+        </activity>
+        <provider
+            android:authorities="uk.me.njae.sunshine"
+            android:name=".data.WeatherProvider" />
     </application>
 
 </manifest>