Browse Source

fixed android manifest

dmuratshin 9 years ago
parent
commit
896b33d2ce

+ 5 - 5
examples/Demo/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.Demo.MainActivity"
         <activity android:name="org.oxygine.Demo.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -23,13 +23,13 @@
             </intent-filter>
             </intent-filter>
         </activity>
         </activity>
     </application>
     </application>
-   
-    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests demo-->    
-    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests demo (downloading files)-->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/DemoBox2D/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.DemoBox2D.MainActivity"
         <activity android:name="org.oxygine.DemoBox2D.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/Game/part1/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.GamePart1.MainActivity"
         <activity android:name="org.oxygine.GamePart1.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/Game/part2/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.GamePart2.MainActivity"
         <activity android:name="org.oxygine.GamePart2.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/Game/part3/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.GamePart3.MainActivity"
         <activity android:name="org.oxygine.GamePart3.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/Game/part4/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.GamePart4.MainActivity"
         <activity android:name="org.oxygine.GamePart4.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/Game/part5/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.GamePart5.MainActivity"
         <activity android:name="org.oxygine.GamePart5.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/HelloWorld/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.HelloWorld.MainActivity"
         <activity android:name="org.oxygine.HelloWorld.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 5 - 1
examples/Match3/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.Match3.MainActivity"
         <activity android:name="org.oxygine.Match3.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" /> 
 
 

+ 6 - 2
oxygine/src/core/oxygine.cpp

@@ -613,6 +613,7 @@ namespace oxygine
                 switch (event.type)
                 switch (event.type)
                 {
                 {
                     case SDL_QUIT:
                     case SDL_QUIT:
+						log::messageln("SDL_QUIT");
                         done = true;
                         done = true;
                         break;
                         break;
                     case SDL_WINDOWEVENT:
                     case SDL_WINDOWEVENT:
@@ -637,8 +638,8 @@ namespace oxygine
                         if (event.window.event == SDL_WINDOWEVENT_FOCUS_GAINED)
                         if (event.window.event == SDL_WINDOWEVENT_FOCUS_GAINED)
                             newFocus = true;
                             newFocus = true;
 #ifdef __ANDROID__
 #ifdef __ANDROID__
-                        if (event.window.event == SDL_WINDOWEVENT_ENTER)
-                            newFocus = true;
+                        //if (event.window.event == SDL_WINDOWEVENT_ENTER)
+                         //   newFocus = true;
 #endif
 #endif
 
 
                         if (focus != newFocus)
                         if (focus != newFocus)
@@ -786,6 +787,8 @@ namespace oxygine
 
 
         void release()
         void release()
         {
         {
+			log::messageln("core::release");
+
             _threadMessages.clear();
             _threadMessages.clear();
             _uiMessages.clear();
             _uiMessages.clear();
 
 
@@ -859,6 +862,7 @@ namespace oxygine
 
 
         void requestQuit()
         void requestQuit()
         {
         {
+			log::messageln("requestQuit");
 #ifdef __S3E__
 #ifdef __S3E__
             s3eDeviceRequestQuit();
             s3eDeviceRequestQuit();
 #elif OXYGINE_SDL
 #elif OXYGINE_SDL

+ 5 - 1
tools/templates/proj.android/AndroidManifest.xml

@@ -14,7 +14,7 @@
         <activity android:name="org.oxygine.${PROJECT}.MainActivity"
         <activity android:name="org.oxygine.${PROJECT}.MainActivity"
                   android:label="@string/app_name"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:configChanges="locale|orientation|keyboardHidden|screenSize" 
                   android:screenOrientation="landscape">
                   android:screenOrientation="landscape">
 
 
             <intent-filter>
             <intent-filter>
@@ -26,6 +26,10 @@
 
 
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
 
 
+    <uses-permission android:name="android.permission.INTERNET" /> <!--used for http requests-->    
+    <uses-permission android:name="android.permission.WAKE_LOCK" /><!--used for http requests (downloading files)-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!--used for Proxy detection, could be disabled-->  
+
     <!-- OpenGL ES 2.0 -->
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
     <uses-feature android:glEsVersion="0x00020000" />