Skip to content

Commit d074f73

Browse files
committed
add minimum SKD version and WAKE_LOCK permission to handheld manifest
1 parent 0be630e commit d074f73

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/processing/mode/android/AndroidBuild.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class AndroidBuild extends JavaBuild {
8383
static public final String min_sdk_fragment = "16"; // Jelly Bean (4.1)
8484
static public final String min_sdk_wallpaper = "16"; //
8585
static public final String min_sdk_cardboard = "19"; // KitKat (4.4)
86+
static public final String min_sdk_handheld = "21"; // Lollipop (5.0)
8687
static public final String min_sdk_watchface = "21"; // Lollipop (5.0)
8788

8889
// Hard-coded target SDK, no longer user-selected.
@@ -541,6 +542,7 @@ private void writeHandheldManifest(final File tmpFolder, String versionCode, Str
541542
replaceMap.put("@@package_name@@", getPackageName());
542543
replaceMap.put("@@version_code@@", versionCode);
543544
replaceMap.put("@@version_name@@", versionName);
545+
replaceMap.put("@@min_sdk@@", AndroidBuild.min_sdk_handheld);
544546
replaceMap.put("@@sketch_class_name@@", sketchClassName);
545547
replaceMap.put("@@uses_permissions@@", usesPermissions);
546548

@@ -1281,7 +1283,7 @@ private void writeMainClass(final File srcDirectory, String renderer) {
12811283
} else if (comp == WALLPAPER) {
12821284
writeWallpaperService(srcDirectory, permissions);
12831285
} else if (comp == WATCHFACE) {
1284-
if (usesGPU()) {
1286+
if (usesOpenGL()) {
12851287
writeWatchFaceGLESService(srcDirectory, permissions);
12861288
} else {
12871289
writeWatchFaceCanvasService(srcDirectory, permissions);

templates/HandheldManifest.xml.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<manifest package="@@package_name@@"
33
android:versionCode="@@version_code@@" android:versionName="@@version_name@@"
44
xmlns:android="http://schemas.android.com/apk/res/android">
5+
<uses-sdk android:minSdkVersion="@@min_sdk@@" />
6+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
57
@@uses_permissions@@
68
<application
79
android:allowBackup="true"

0 commit comments

Comments
 (0)