diff options
author | dhewg | 2011-03-03 22:15:10 +0100 |
---|---|---|
committer | dhewg | 2011-03-04 21:31:13 +0100 |
commit | 03347a25e148e264383a8139c9b5c0be0d7981fa (patch) | |
tree | be83aa838728e51fad6e854d6f2880b1a1013b9d /dists/android | |
parent | 62c1c1b821c309faab0f076be7c1b9eee69a2792 (diff) | |
download | scummvm-rg350-03347a25e148e264383a8139c9b5c0be0d7981fa.tar.gz scummvm-rg350-03347a25e148e264383a8139c9b5c0be0d7981fa.tar.bz2 scummvm-rg350-03347a25e148e264383a8139c9b5c0be0d7981fa.zip |
ANDROID: Reindent manifest
Diffstat (limited to 'dists/android')
-rw-r--r-- | dists/android/AndroidManifest.xml | 112 | ||||
-rw-r--r-- | dists/android/AndroidManifest.xml.in | 112 |
2 files changed, 116 insertions, 108 deletions
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index 339655b471..68c58d9aea 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -1,57 +1,61 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- --> +<?xml version="1.0" encoding="utf-8"?> <!-- NB: android:versionCode needs to be bumped for formal releases --> + <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm" - android:versionCode="6" android:versionName="1.3.0git" - android:installLocation="preferExternal"> - - <!-- This version works on Android 1.5 (SDK 3) and newer, but we - want Android 2.2 (SDK 8) defaults and features. - --> - <uses-sdk android:minSdkVersion="3" - android:targetSdkVersion="8" /> - - <application android:name=".ScummVMApplication" - android:label="@string/app_name" - android:description="@string/app_desc" - android:icon="@drawable/scummvm"> - <activity android:name=".ScummVMActivity" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden" - 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.inodes.gus.unpacker.nextActivity" - android:value="org.inodes.gus.scummvm/.ScummVMActivity" /> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - - <permission android:name="org.inodes.gus.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. - Can work with a D-pad / trackball --> - <uses-configuration android:reqFiveWayNav="true" - android:reqKeyboardType="qwerty"/> - <!-- .. or touchscreen --> - <uses-configuration android:reqTouchScreen="finger" - android:reqKeyboardType="qwerty"/> - <uses-configuration android:reqTouchScreen="stylus" - android:reqKeyboardType="qwerty"/> + package="org.inodes.gus.scummvm" + android:versionCode="6" + android:versionName="1.3.0git" + android:installLocation="preferExternal"> + + <!-- This version works on Android 1.5 (SDK 3) and newer, but we + want Android 2.2 (SDK 8) defaults and features. --> + <uses-sdk android:minSdkVersion="3" + android:targetSdkVersion="8"/> + + <application android:name=".ScummVMApplication" + android:label="@string/app_name" + android:description="@string/app_desc" + android:icon="@drawable/scummvm"> + <activity android:name=".ScummVMActivity" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:screenOrientation="landscape" + android:configChanges="orientation|keyboardHidden" + 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.inodes.gus.unpacker.nextActivity" + android:value="org.inodes.gus.scummvm/.ScummVMActivity"/> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + </application> + + <permission android:name="org.inodes.gus.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. + Can work with a D-pad / trackball --> + <uses-configuration android:reqFiveWayNav="true" + android:reqKeyboardType="qwerty"/> + + <!-- .. or touchscreen --> + <uses-configuration android:reqTouchScreen="finger" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="stylus" + android:reqKeyboardType="qwerty"/> </manifest> + diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index 3ff96aa3dd..7a75b6fd0b 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -1,57 +1,61 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- --> +<?xml version="1.0" encoding="utf-8"?> <!-- NB: android:versionCode needs to be bumped for formal releases --> + <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.inodes.gus.scummvm" - android:versionCode="6" android:versionName="@VERSION@" - android:installLocation="preferExternal"> - - <!-- This version works on Android 1.5 (SDK 3) and newer, but we - want Android 2.2 (SDK 8) defaults and features. - --> - <uses-sdk android:minSdkVersion="3" - android:targetSdkVersion="8" /> - - <application android:name=".ScummVMApplication" - android:label="@string/app_name" - android:description="@string/app_desc" - android:icon="@drawable/scummvm"> - <activity android:name=".ScummVMActivity" - android:theme="@android:style/Theme.NoTitleBar.Fullscreen" - android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden" - 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.inodes.gus.unpacker.nextActivity" - android:value="org.inodes.gus.scummvm/.ScummVMActivity" /> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> - - <permission android:name="org.inodes.gus.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. - Can work with a D-pad / trackball --> - <uses-configuration android:reqFiveWayNav="true" - android:reqKeyboardType="qwerty"/> - <!-- .. or touchscreen --> - <uses-configuration android:reqTouchScreen="finger" - android:reqKeyboardType="qwerty"/> - <uses-configuration android:reqTouchScreen="stylus" - android:reqKeyboardType="qwerty"/> + package="org.inodes.gus.scummvm" + android:versionCode="6" + android:versionName="@VERSION@" + android:installLocation="preferExternal"> + + <!-- This version works on Android 1.5 (SDK 3) and newer, but we + want Android 2.2 (SDK 8) defaults and features. --> + <uses-sdk android:minSdkVersion="3" + android:targetSdkVersion="8"/> + + <application android:name=".ScummVMApplication" + android:label="@string/app_name" + android:description="@string/app_desc" + android:icon="@drawable/scummvm"> + <activity android:name=".ScummVMActivity" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:screenOrientation="landscape" + android:configChanges="orientation|keyboardHidden" + 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.inodes.gus.unpacker.nextActivity" + android:value="org.inodes.gus.scummvm/.ScummVMActivity"/> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + </application> + + <permission android:name="org.inodes.gus.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. + Can work with a D-pad / trackball --> + <uses-configuration android:reqFiveWayNav="true" + android:reqKeyboardType="qwerty"/> + + <!-- .. or touchscreen --> + <uses-configuration android:reqTouchScreen="finger" + android:reqKeyboardType="qwerty"/> + + <uses-configuration android:reqTouchScreen="stylus" + android:reqKeyboardType="qwerty"/> </manifest> + |