add minimum SKD version and WAKE_LOCK permission to handheld manifest

codeanticode · codeanticode · commit d074f731d2c9 · 2017-02-11T18:48:46.000-05:00
diff --git a/src/processing/mode/android/AndroidBuild.java b/src/processing/mode/android/AndroidBuild.java
@@ -83,6 +83,7 @@ class AndroidBuild extends JavaBuild {
   static public final String min_sdk_fragment  = "16"; // Jelly Bean (4.1)
   static public final String min_sdk_wallpaper = "16"; // 
   static public final String min_sdk_cardboard = "19"; // KitKat (4.4)
+  static public final String min_sdk_handheld  = "21"; // Lollipop (5.0)
   static public final String min_sdk_watchface = "21"; // Lollipop (5.0)
   
   // Hard-coded target SDK, no longer user-selected.
@@ -541,6 +542,7 @@ private void writeHandheldManifest(final File tmpFolder, String versionCode, Str
     replaceMap.put("@@package_name@@", getPackageName());    
     replaceMap.put("@@version_code@@", versionCode);
     replaceMap.put("@@version_name@@", versionName);
+    replaceMap.put("@@min_sdk@@", AndroidBuild.min_sdk_handheld);
     replaceMap.put("@@sketch_class_name@@", sketchClassName);
     replaceMap.put("@@uses_permissions@@", usesPermissions);
         
@@ -1281,7 +1283,7 @@ private void writeMainClass(final File srcDirectory, String renderer) {
     } else if (comp == WALLPAPER) {
       writeWallpaperService(srcDirectory, permissions);
     } else if (comp == WATCHFACE) {
-      if (usesGPU()) {
+      if (usesOpenGL()) {
         writeWatchFaceGLESService(srcDirectory, permissions);  
       } else {
         writeWatchFaceCanvasService(srcDirectory, permissions);  
diff --git a/templates/HandheldManifest.xml.tmpl b/templates/HandheldManifest.xml.tmpl
@@ -2,6 +2,8 @@
 <manifest package="@@package_name@@"
           android:versionCode="@@version_code@@" android:versionName="@@version_name@@"    
           xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-sdk android:minSdkVersion="@@min_sdk@@" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
     @@uses_permissions@@
     <application
         android:allowBackup="true"
