avoid default wavelock, add a --wavelock options if needed.

tito · tito · commit f8dc9d8e9c59 · 2013-05-05T18:45:51.000+02:00
diff --git a/src/build.py b/src/build.py
@@ -338,6 +338,8 @@ def make_package(args):
     ap.add_argument('--minsdk', dest='min_sdk_version', default='8', help='Minimum Android SDK version to use. Default to 8')
     ap.add_argument('--window', dest='window', action='store_true',
             help='Indicate if the application will be windowed')
+    ap.add_argument('--wakelock', dest='wakelock', action='store_true',
+            help='Indicate if the application needs the device to stay on')
     ap.add_argument('command', nargs='*', help='The command to pass to ant (debug, release, installd, installr)')
 
     args = ap.parse_args()
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -32,6 +32,7 @@ public class PythonActivity extends Activity implements Runnable {
     // The SDLSurfaceView we contain.
     public static SDLSurfaceView mView = null;
     public static PythonActivity mActivity = null;
+    public static ApplicationInfo mInfo = null;
 
     // Did we launch our thread?
     private boolean mLaunchedThread = false;
@@ -101,10 +102,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // go to fullscreen mode if requested
         try {
-            ApplicationInfo ai = this.getPackageManager().getApplicationInfo(
+            this.mInfo = this.getPackageManager().getApplicationInfo(
                     this.getPackageName(), PackageManager.GET_META_DATA);
-            Log.v("python", "metadata fullscreen is" + ai.metaData.get("fullscreen"));
-            if ( (Integer)ai.metaData.get("fullscreen") == 1 ) {
+            Log.v("python", "metadata fullscreen is" + this.mInfo.metaData.get("fullscreen"));
+            if ( (Integer)this.mInfo.metaData.get("fullscreen") == 1 ) {
                 getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
             }
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -43,6 +43,8 @@
 import android.opengl.GLSurfaceView;
 import android.net.Uri;
 import android.os.PowerManager;
+import android.content.pm.PackageManager;
+import android.content.pm.ApplicationInfo;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -353,7 +355,16 @@ public SDLSurfaceView(Activity act, String argument) {
         mArgument = argument;
 
         PowerManager pm = (PowerManager) act.getSystemService(Context.POWER_SERVICE);
-        wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
+
+        wakeLock = null;
+        try {
+            ApplicationInfo ai = act.getPackageManager().getApplicationInfo(
+                    act.getPackageName(), PackageManager.GET_META_DATA);
+            if ( (Integer)ai.metaData.get("wavelock") == 1 ) {
+                wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+        }
     }
 
 
@@ -437,7 +448,8 @@ public void onPause() {
             }
         }
 
-        wakeLock.release();
+        if ( wakeLock != null )
+            wakeLock.release();
 
     }
 
@@ -455,7 +467,8 @@ public void onResume() {
                 this.notifyAll();
             }
         }
-        wakeLock.acquire();
+        if ( wakeLock != null )
+            wakeLock.acquire();
     }
 
     public void onDestroy() {
diff --git a/src/templates/AndroidManifest.tmpl.xml b/src/templates/AndroidManifest.tmpl.xml
@@ -10,11 +10,8 @@
                android:icon="@drawable/icon"
                >
 
-    {% if args.window %}
-    <meta-data android:name="fullscreen" android:value="0"/>
-    {% else %}
-    <meta-data android:name="fullscreen" android:value="1"/>
-    {% endif %}
+    <meta-data android:name="fullscreen" android:value="{% if args.window %}0{% else %}1{% endif %}"/>
+    <meta-data android:name="wavelock" android:value="{% if args.wavelock %}1{% else %}0{% endif %}"/>
 
     <activity android:name="org.renpy.android.PythonActivity"
               android:label="@string/iconName"
@@ -66,7 +63,9 @@
   </application>
 
   <uses-sdk android:minSdkVersion="{{ args.min_sdk_version }}" android:targetSdkVersion="{{ args.sdk_version }}"/>
+  {% if args.wavelock %}
   <uses-permission android:name="android.permission.WAKE_LOCK" />
+  {% endif %}
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
   {% for perm in args.permissions %}

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@`
`43`	`43`	`import android.opengl.GLSurfaceView;`
`44`	`44`	`import android.net.Uri;`
`45`	`45`	`import android.os.PowerManager;`
	`46`	`+import android.content.pm.PackageManager;`
	`47`	`+import android.content.pm.ApplicationInfo;`
`46`	`48`
`47`	`49`	`import java.io.IOException;`
`48`	`50`	`import java.io.InputStream;`
`@@ -353,7 +355,16 @@ public SDLSurfaceView(Activity act, String argument) {`
`353`	`355`	`mArgument = argument;`
`354`	`356`
`355`	`357`	`PowerManager pm = (PowerManager) act.getSystemService(Context.POWER_SERVICE);`
`356`		`- wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");`
	`358`	`+`
	`359`	`+ wakeLock = null;`
	`360`	`+ try {`
	`361`	`+ ApplicationInfo ai = act.getPackageManager().getApplicationInfo(`
	`362`	`+ act.getPackageName(), PackageManager.GET_META_DATA);`
	`363`	`+ if ( (Integer)ai.metaData.get("wavelock") == 1 ) {`
	`364`	`+ wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");`
	`365`	`+ }`
	`366`	`+ } catch (PackageManager.NameNotFoundException e) {`
	`367`	`+ }`
`357`	`368`	`}`
`358`	`369`
`359`	`370`
`@@ -437,7 +448,8 @@ public void onPause() {`
`437`	`448`	`}`
`438`	`449`	`}`
`439`	`450`
`440`		`- wakeLock.release();`
	`451`	`+ if ( wakeLock != null )`
	`452`	`+ wakeLock.release();`
`441`	`453`
`442`	`454`	`}`
`443`	`455`
`@@ -455,7 +467,8 @@ public void onResume() {`
`455`	`467`	`this.notifyAll();`
`456`	`468`	`}`
`457`	`469`	`}`
`458`		`- wakeLock.acquire();`
	`470`	`+ if ( wakeLock != null )`
	`471`	`+ wakeLock.acquire();`
`459`	`472`	`}`
`460`	`473`
`461`	`474`	`public void onDestroy() {`