diff options
author | Paul Gilbert | 2015-05-31 14:45:10 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-05-31 14:45:10 -0400 |
commit | e5296ebf8dd09f603499b1894a33865ec71bb28f (patch) | |
tree | d7de032efd54dfdb3159cbc778a0c9ce8cd8aa91 /dists/android/AndroidManifest.xml.in | |
parent | 673537bad93f0b440172a0cc263ebf19cc95ffc0 (diff) | |
parent | 141ff4d08dc24b6bb17098bd71801e2a58e6a38f (diff) | |
download | scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.tar.gz scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.tar.bz2 scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.zip |
Merge branch 'master' into phantom
Diffstat (limited to 'dists/android/AndroidManifest.xml.in')
-rw-r--r-- | dists/android/AndroidManifest.xml.in | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index bf45ffcc0e..d90e282e3d 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -5,7 +5,6 @@ package="org.scummvm.scummvm" android:versionCode="@ANDROID_VERSIONCODE@" android:versionName="@VERSION@" - android:installLocation="preferExternal" android:sharedUserId="org.scummvm.scummvm"> <!-- This version works on Android 1.5 (SDK 3) and newer, but we @@ -13,7 +12,7 @@ <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8"/> - <application android:name=".ScummVMApplication" + <application android:label="@string/app_name" android:description="@string/app_desc" android:icon="@drawable/scummvm"> @@ -24,28 +23,12 @@ android:windowSoftInputMode="adjustResize"> <intent-filter> <action android:name="android.intent.action.MAIN"/> - </intent-filter> - </activity> - - <activity android:name=".Unpacker" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden"> - <meta-data android:name="org.scummvm.unpacker.nextActivity" - android:value="org.scummvm.scummvm/.ScummVMActivity"/> - <intent-filter> - <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> <category android:name="tv.ouya.intent.category.GAME"/> </intent-filter> </activity> </application> - <permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN" - android:label="@string/scummvm_perm_plugin_label" - android:description="@string/scummvm_perm_plugin_desc" - android:protectionLevel="signature"/> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <!-- Always needs some sort of qwerty keyboard. |