-Added google play services (needed for some stuff)

-Added new screen resizing options, stretch_2d is removed, new much more flexible ones.
-Fixed bug in viewport (can create more instances in 3d-in-2d demo now)
-Can set android permissions and screen sizes manually in the export settings
-Changed export templates extension to .tpz (too many people unzipped the manually..)
-File dialog now ensures that the proper extension is used (will not allow to save without it)
-Fixed bug that made collision exceptions not work in 2D

1 files changed, 172 insertions, 9 deletions

diff --git a/platform/android/AndroidManifest.xml.template b/platform/android/AndroidManifest.xml.template
index 99c3650efa..e723b693d8 100644
--- a/platform/android/AndroidManifest.xml.template
+++ b/platform/android/AndroidManifest.xml.template
@@ -5,6 +5,11 @@
       android:versionName="1.0"
       android:installLocation="preferExternal"
       >
+<supports-screens android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:xlargeScreens="true"/>
+
     <application android:label="@string/godot_project_name_string" android:icon="@drawable/icon">
         <activity android:name="com.android.godot.Godot"
                   android:label="@string/godot_project_name_string"
@@ -26,15 +31,173 @@ $$ADD_APPLICATION_CHUNKS$$
 
     </application>
     <uses-feature android:glEsVersion="0x00020000"/>
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>    
-	<uses-permission android:name="android.permission.READ_CONTACTS"/>
-	<uses-permission android:name="com.android.vending.BILLING" />
-	<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.RECEIVE_SMS"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-	
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="15"/>
+<uses-permission android:name="godot.ACCESS_CHECKIN_PROPERTIES"/>
+<uses-permission android:name="godot.ACCESS_COARSE_LOCATION"/>
+<uses-permission android:name="godot.ACCESS_FINE_LOCATION"/>
+<uses-permission android:name="godot.ACCESS_LOCATION_EXTRA_COMMANDS"/>
+<uses-permission android:name="godot.ACCESS_MOCK_LOCATION"/>
+<uses-permission android:name="godot.ACCESS_NETWORK_STATE"/>
+<uses-permission android:name="godot.ACCESS_SURFACE_FLINGER"/>
+<uses-permission android:name="godot.ACCESS_WIFI_STATE"/>
+<uses-permission android:name="godot.ACCOUNT_MANAGER"/>
+<uses-permission android:name="godot.ADD_VOICEMAIL"/>
+<uses-permission android:name="godot.AUTHENTICATE_ACCOUNTS"/>
+<uses-permission android:name="godot.BATTERY_STATS"/>
+<uses-permission android:name="godot.BIND_ACCESSIBILITY_SERVICE"/>
+<uses-permission android:name="godot.BIND_APPWIDGET"/>
+<uses-permission android:name="godot.BIND_DEVICE_ADMIN"/>
+<uses-permission android:name="godot.BIND_INPUT_METHOD"/>
+<uses-permission android:name="godot.BIND_NFC_SERVICE"/>
+<uses-permission android:name="godot.BIND_NOTIFICATION_LISTENER_SERVICE"/>
+<uses-permission android:name="godot.BIND_PRINT_SERVICE"/>
+<uses-permission android:name="godot.BIND_REMOTEVIEWS"/>
+<uses-permission android:name="godot.BIND_TEXT_SERVICE"/>
+<uses-permission android:name="godot.BIND_VPN_SERVICE"/>
+<uses-permission android:name="godot.BIND_WALLPAPER"/>
+<uses-permission android:name="godot.BLUETOOTH"/>
+<uses-permission android:name="godot.BLUETOOTH_ADMIN"/>
+<uses-permission android:name="godot.BLUETOOTH_PRIVILEGED"/>
+<uses-permission android:name="godot.BRICK"/>
+<uses-permission android:name="godot.BROADCAST_PACKAGE_REMOVED"/>
+<uses-permission android:name="godot.BROADCAST_SMS"/>
+<uses-permission android:name="godot.BROADCAST_STICKY"/>
+<uses-permission android:name="godot.BROADCAST_WAP_PUSH"/>
+<uses-permission android:name="godot.CALL_PHONE"/>
+<uses-permission android:name="godot.CALL_PRIVILEGED"/>
+<uses-permission android:name="godot.CAMERA"/>
+<uses-permission android:name="godot.CAPTURE_AUDIO_OUTPUT"/>
+<uses-permission android:name="godot.CAPTURE_SECURE_VIDEO_OUTPUT"/>
+<uses-permission android:name="godot.CAPTURE_VIDEO_OUTPUT"/>
+<uses-permission android:name="godot.CHANGE_COMPONENT_ENABLED_STATE"/>
+<uses-permission android:name="godot.CHANGE_CONFIGURATION"/>
+<uses-permission android:name="godot.CHANGE_NETWORK_STATE"/>
+<uses-permission android:name="godot.CHANGE_WIFI_MULTICAST_STATE"/>
+<uses-permission android:name="godot.CHANGE_WIFI_STATE"/>
+<uses-permission android:name="godot.CLEAR_APP_CACHE"/>
+<uses-permission android:name="godot.CLEAR_APP_USER_DATA"/>
+<uses-permission android:name="godot.CONTROL_LOCATION_UPDATES"/>
+<uses-permission android:name="godot.DELETE_CACHE_FILES"/>
+<uses-permission android:name="godot.DELETE_PACKAGES"/>
+<uses-permission android:name="godot.DEVICE_POWER"/>
+<uses-permission android:name="godot.DIAGNOSTIC"/>
+<uses-permission android:name="godot.DISABLE_KEYGUARD"/>
+<uses-permission android:name="godot.DUMP"/>
+<uses-permission android:name="godot.EXPAND_STATUS_BAR"/>
+<uses-permission android:name="godot.FACTORY_TEST"/>
+<uses-permission android:name="godot.FLASHLIGHT"/>
+<uses-permission android:name="godot.FORCE_BACK"/>
+<uses-permission android:name="godot.GET_ACCOUNTS"/>
+<uses-permission android:name="godot.GET_PACKAGE_SIZE"/>
+<uses-permission android:name="godot.GET_TASKS"/>
+<uses-permission android:name="godot.GET_TOP_ACTIVITY_INFO"/>
+<uses-permission android:name="godot.GLOBAL_SEARCH"/>
+<uses-permission android:name="godot.HARDWARE_TEST"/>
+<uses-permission android:name="godot.INJECT_EVENTS"/>
+<uses-permission android:name="godot.INSTALL_LOCATION_PROVIDER"/>
+<uses-permission android:name="godot.INSTALL_PACKAGES"/>
+<uses-permission android:name="godot.INSTALL_SHORTCUT"/>
+<uses-permission android:name="godot.INTERNAL_SYSTEM_WINDOW"/>
+<uses-permission android:name="godot.INTERNET"/>
+<uses-permission android:name="godot.KILL_BACKGROUND_PROCESSES"/>
+<uses-permission android:name="godot.LOCATION_HARDWARE"/>
+<uses-permission android:name="godot.MANAGE_ACCOUNTS"/>
+<uses-permission android:name="godot.MANAGE_APP_TOKENS"/>
+<uses-permission android:name="godot.MANAGE_DOCUMENTS"/>
+<uses-permission android:name="godot.MASTER_CLEAR"/>
+<uses-permission android:name="godot.MEDIA_CONTENT_CONTROL"/>
+<uses-permission android:name="godot.MODIFY_AUDIO_SETTINGS"/>
+<uses-permission android:name="godot.MODIFY_PHONE_STATE"/>
+<uses-permission android:name="godot.MOUNT_FORMAT_FILESYSTEMS"/>
+<uses-permission android:name="godot.MOUNT_UNMOUNT_FILESYSTEMS"/>
+<uses-permission android:name="godot.NFC"/>
+<uses-permission android:name="godot.PERSISTENT_ACTIVITY"/>
+<uses-permission android:name="godot.PROCESS_OUTGOING_CALLS"/>
+<uses-permission android:name="godot.READ_CALENDAR"/>
+<uses-permission android:name="godot.READ_CALL_LOG"/>
+<uses-permission android:name="godot.READ_CONTACTS"/>
+<uses-permission android:name="godot.READ_EXTERNAL_STORAGE"/>
+<uses-permission android:name="godot.READ_FRAME_BUFFER"/>
+<uses-permission android:name="godot.READ_HISTORY_BOOKMARKS"/>
+<uses-permission android:name="godot.READ_INPUT_STATE"/>
+<uses-permission android:name="godot.READ_LOGS"/>
+<uses-permission android:name="godot.READ_PHONE_STATE"/>
+<uses-permission android:name="godot.READ_PROFILE"/>
+<uses-permission android:name="godot.READ_SMS"/>
+<uses-permission android:name="godot.READ_SOCIAL_STREAM"/>
+<uses-permission android:name="godot.READ_SYNC_SETTINGS"/>
+<uses-permission android:name="godot.READ_SYNC_STATS"/>
+<uses-permission android:name="godot.READ_USER_DICTIONARY"/>
+<uses-permission android:name="godot.REBOOT"/>
+<uses-permission android:name="godot.RECEIVE_BOOT_COMPLETED"/>
+<uses-permission android:name="godot.RECEIVE_MMS"/>
+<uses-permission android:name="godot.RECEIVE_SMS"/>
+<uses-permission android:name="godot.RECEIVE_WAP_PUSH"/>
+<uses-permission android:name="godot.RECORD_AUDIO"/>
+<uses-permission android:name="godot.REORDER_TASKS"/>
+<uses-permission android:name="godot.RESTART_PACKAGES"/>
+<uses-permission android:name="godot.SEND_RESPOND_VIA_MESSAGE"/>
+<uses-permission android:name="godot.SEND_SMS"/>
+<uses-permission android:name="godot.SET_ACTIVITY_WATCHER"/>
+<uses-permission android:name="godot.SET_ALARM"/>
+<uses-permission android:name="godot.SET_ALWAYS_FINISH"/>
+<uses-permission android:name="godot.SET_ANIMATION_SCALE"/>
+<uses-permission android:name="godot.SET_DEBUG_APP"/>
+<uses-permission android:name="godot.SET_ORIENTATION"/>
+<uses-permission android:name="godot.SET_POINTER_SPEED"/>
+<uses-permission android:name="godot.SET_PREFERRED_APPLICATIONS"/>
+<uses-permission android:name="godot.SET_PROCESS_LIMIT"/>
+<uses-permission android:name="godot.SET_TIME"/>
+<uses-permission android:name="godot.SET_TIME_ZONE"/>
+<uses-permission android:name="godot.SET_WALLPAPER"/>
+<uses-permission android:name="godot.SET_WALLPAPER_HINTS"/>
+<uses-permission android:name="godot.SIGNAL_PERSISTENT_PROCESSES"/>
+<uses-permission android:name="godot.STATUS_BAR"/>
+<uses-permission android:name="godot.SUBSCRIBED_FEEDS_READ"/>
+<uses-permission android:name="godot.SUBSCRIBED_FEEDS_WRITE"/>
+<uses-permission android:name="godot.SYSTEM_ALERT_WINDOW"/>
+<uses-permission android:name="godot.TRANSMIT_IR"/>
+<uses-permission android:name="godot.UNINSTALL_SHORTCUT"/>
+<uses-permission android:name="godot.UPDATE_DEVICE_STATS"/>
+<uses-permission android:name="godot.USE_CREDENTIALS"/>
+<uses-permission android:name="godot.USE_SIP"/>
+<uses-permission android:name="godot.VIBRATE"/>
+<uses-permission android:name="godot.WAKE_LOCK"/>
+<uses-permission android:name="godot.WRITE_APN_SETTINGS"/>
+<uses-permission android:name="godot.WRITE_CALENDAR"/>
+<uses-permission android:name="godot.WRITE_CALL_LOG"/>
+<uses-permission android:name="godot.WRITE_CONTACTS"/>
+<uses-permission android:name="godot.WRITE_EXTERNAL_STORAGE"/>
+<uses-permission android:name="godot.WRITE_GSERVICES"/>
+<uses-permission android:name="godot.WRITE_HISTORY_BOOKMARKS"/>
+<uses-permission android:name="godot.WRITE_PROFILE"/>
+<uses-permission android:name="godot.WRITE_SECURE_SETTINGS"/>
+<uses-permission android:name="godot.WRITE_SETTINGS"/>
+<uses-permission android:name="godot.WRITE_SMS"/>
+<uses-permission android:name="godot.WRITE_SOCIAL_STREAM"/>
+<uses-permission android:name="godot.WRITE_SYNC_SETTINGS"/>
+<uses-permission android:name="godot.WRITE_USER_DICTIONARY"/>
+<uses-permission android:name="godot.custom.0"/>
+<uses-permission android:name="godot.custom.1"/>
+<uses-permission android:name="godot.custom.2"/>
+<uses-permission android:name="godot.custom.3"/>
+<uses-permission android:name="godot.custom.4"/>
+<uses-permission android:name="godot.custom.5"/>
+<uses-permission android:name="godot.custom.6"/>
+<uses-permission android:name="godot.custom.7"/>
+<uses-permission android:name="godot.custom.8"/>
+<uses-permission android:name="godot.custom.9"/>
+<uses-permission android:name="godot.custom.0"/>
+<uses-permission android:name="godot.custom.11"/>
+<uses-permission android:name="godot.custom.12"/>
+<uses-permission android:name="godot.custom.13"/>
+<uses-permission android:name="godot.custom.14"/>
+<uses-permission android:name="godot.custom.15"/>
+<uses-permission android:name="godot.custom.16"/>
+<uses-permission android:name="godot.custom.17"/>
+<uses-permission android:name="godot.custom.18"/>
+<uses-permission android:name="godot.custom.19"/>
+
+<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="15"/>
          
 </manifest>