← Back to branch summary

~openlp-android/openlp/version2

« back to all changes in this revision

Viewing changes to app/src/main/AndroidManifest.xml

  • Committer: Tim Bentley
  • Date: 2015-01-19 20:26:35 UTC
  • Revision ID: tim.bentley@gmail.com-20150119202635-v3m2zh27ayojhc32
Updates for Tablet

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/src/main/AndroidManifest.xml
1
1
<?xml version="1.0" encoding="utf-8"?>
2
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
3
    package="org.openlp.android2" >
4
 
    <uses-permission android:name="android.permission.INTERNET"/>
5
 
    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 
4
 
 
5
    <uses-permission android:name="android.permission.INTERNET" />
 
6
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
6
7
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
8
 
7
9
    <application
8
10
        android:allowBackup="true"
9
11
        android:icon="@drawable/ic_launcher"
19
21
            </intent-filter>
20
22
        </activity>
21
23
        <activity
 
24
            android:name=".fragments.SettingsActivity"
 
25
            android:label="@string/title_activity_settings" >
 
26
        </activity>
 
27
        <activity
22
28
            android:name=".activities.SettingsActivity"
23
29
            android:label="@string/title_activity_settings"
24
30
            android:parentActivityName=".OpenLP" >
27
33
                android:value="org.openlp.android2.OpenLP" />
28
34
        </activity>
29
35
        <activity
30
 
                android:name=".activities.ConnectionActivity"
31
 
                android:label="@string/title_activity_settings"
32
 
                android:parentActivityName=".OpenLP" >
 
36
            android:name=".activities.ConnectionActivity"
 
37
            android:label="@string/title_activity_settings"
 
38
            android:parentActivityName=".OpenLP" >
33
39
            <meta-data
34
 
                    android:name="android.support.PARENT_ACTIVITY"
35
 
                    android:value="org.openlp.android2.OpenLP" />
 
40
                android:name="android.support.PARENT_ACTIVITY"
 
41
                android:value="org.openlp.android2.OpenLP" />
36
42
        </activity>
37
43
    </application>
38
44