processing
diff --git a/‎core/src/processing/android/PFragment.java‎
Lines changed: 4 additions & 19 deletions b/‎core/src/processing/android/PFragment.java‎
Lines changed: 4 additions & 19 deletions
diff --git a/‎core/src/processing/android/PWallpaper.java‎
Lines changed: 3 additions & 18 deletions b/‎core/src/processing/android/PWallpaper.java‎
Lines changed: 3 additions & 18 deletions
diff --git a/‎core/src/processing/android/PWatchFaceCanvas.java‎
Lines changed: 3 additions & 18 deletions b/‎core/src/processing/android/PWatchFaceCanvas.java‎
Lines changed: 3 additions & 18 deletions
diff --git a/‎core/src/processing/android/PWatchFaceGLES.java‎
Lines changed: 3 additions & 18 deletions b/‎core/src/processing/android/PWatchFaceGLES.java‎
Lines changed: 3 additions & 18 deletions
diff --git a/‎src/processing/mode/android/AVD.java‎
Lines changed: 6 additions & 6 deletions b/‎src/processing/mode/android/AVD.java‎
Lines changed: 6 additions & 6 deletions
@@ -3,7 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2016 The Processing Foundation
+  Copyright (c) 2016-17 The Processing Foundation
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -33,7 +33,6 @@
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Point;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.Display;
@@ -68,36 +67,22 @@ public PFragment(PApplet sketch) {
   public void initDimensions() {
     WindowManager wm = getActivity().getWindowManager();
     Display display = wm.getDefaultDisplay();
-    metrics = new DisplayMetrics();
-    display.getMetrics(metrics);
 
-//    display.getRealMetrics(metrics); // API 17 or higher
-//    display.getRealSize(size);
+    metrics = new DisplayMetrics();
+    display.getRealMetrics(metrics);
 
     size = new Point();
-    if (Build.VERSION.SDK_INT >= 17) {
-      display.getRealSize(size);
-    } else if (Build.VERSION.SDK_INT >= 14) {
-      // Use undocumented methods getRawWidth, getRawHeight
-      try {
-        size.x = (Integer) Display.class.getMethod("getRawWidth").invoke(display);
-        size.y = (Integer) Display.class.getMethod("getRawHeight").invoke(display);
-      } catch (Exception e) {
-        display.getSize(size);
-      }
-    }
+    display.getRealSize(size);
   }
 
 
   public int getDisplayWidth() {
     return size.x;
-//    return metrics.widthPixels;
   }
 
 
   public int getDisplayHeight() {
     return size.y;
-//    return metrics.heightPixels;
   }
 
 
 
@@ -28,7 +28,6 @@
 import android.view.WindowManager;
 import processing.core.PApplet;
 import android.util.DisplayMetrics;
-import android.os.Build;
 import android.view.Display;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -42,36 +41,22 @@ public class PWallpaper extends WallpaperService implements AppComponent {
   public void initDimensions() {
     WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
     Display display = wm.getDefaultDisplay();
-    metrics = new DisplayMetrics();
-    display.getMetrics(metrics);
 
-//    display.getRealMetrics(metrics); // API 17 or higher
-//    display.getRealSize(size);
+    metrics = new DisplayMetrics();
+    display.getRealMetrics(metrics);
 
     size = new Point();
-    if (Build.VERSION.SDK_INT >= 17) {
-      display.getRealSize(size);
-    } else if (Build.VERSION.SDK_INT >= 14) {
-      // Use undocumented methods getRawWidth, getRawHeight
-      try {
-        size.x = (Integer) Display.class.getMethod("getRawWidth").invoke(display);
-        size.y = (Integer) Display.class.getMethod("getRawHeight").invoke(display);
-      } catch (Exception e) {
-        display.getSize(size);
-      }
-    }
+    display.getRealSize(size);
   }
 
 
   public int getDisplayWidth() {
     return size.x;
-//    return metrics.widthPixels;
   }
 
 
   public int getDisplayHeight() {
     return size.y;
-//    return metrics.heightPixels;
   }
 
 
 
@@ -26,7 +26,6 @@
 
 import android.graphics.Canvas;
 import android.graphics.Point;
-import android.os.Build;
 import android.os.Bundle;
 import android.graphics.Rect;
 import android.support.wearable.complications.ComplicationData;
@@ -52,36 +51,22 @@ public class PWatchFaceCanvas extends CanvasWatchFaceService implements AppCompo
   public void initDimensions() {
     WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
     Display display = wm.getDefaultDisplay();
-    metrics = new DisplayMetrics();
-    display.getMetrics(metrics);
 
-//  display.getRealMetrics(metrics); // API 17 or higher
-//  display.getRealSize(size);
+    metrics = new DisplayMetrics();
+    display.getRealMetrics(metrics);
 
     size = new Point();
-    if (Build.VERSION.SDK_INT >= 17) {
-      display.getRealSize(size);
-    } else if (Build.VERSION.SDK_INT >= 14) {
-      // Use undocumented methods getRawWidth, getRawHeight
-      try {
-        size.x = (Integer) Display.class.getMethod("getRawWidth").invoke(display);
-        size.y = (Integer) Display.class.getMethod("getRawHeight").invoke(display);
-      } catch (Exception e) {
-        display.getSize(size);
-      }
-    }
+    display.getRealSize(size);
   }
 
 
   public int getDisplayWidth() {
     return size.x;
-//    return metrics.widthPixels;
   }
 
 
   public int getDisplayHeight() {
     return size.y;
-//    return metrics.heightPixels;
   }
 
 
 
@@ -23,7 +23,6 @@
 package processing.android;
 
 import android.graphics.Point;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.Display;
 import android.view.WindowInsets;
@@ -50,36 +49,22 @@ public class PWatchFaceGLES extends Gles2WatchFaceService implements AppComponen
   public void initDimensions() {
     WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
     Display display = wm.getDefaultDisplay();
-    metrics = new DisplayMetrics();
-    display.getMetrics(metrics);
 
-//  display.getRealMetrics(metrics); // API 17 or higher
-//  display.getRealSize(size);
+    metrics = new DisplayMetrics();
+    display.getRealMetrics(metrics);
 
     size = new Point();
-    if (Build.VERSION.SDK_INT >= 17) {
-      display.getRealSize(size);
-    } else if (Build.VERSION.SDK_INT >= 14) {
-      // Use undocumented methods getRawWidth, getRawHeight
-      try {
-        size.x = (Integer) Display.class.getMethod("getRawWidth").invoke(display);
-        size.y = (Integer) Display.class.getMethod("getRawHeight").invoke(display);
-      } catch (Exception e) {
-        display.getSize(size);
-      }
-    }
+    display.getRealSize(size);
   }
 
 
   public int getDisplayWidth() {
     return size.x;
-//    return metrics.widthPixels;
   }
 
 
   public int getDisplayHeight() {
     return size.y;
-//    return metrics.heightPixels;
   }
 
 
 
@@ -88,13 +88,13 @@ public class AVD {
   /** Default virtual device used by Processing. */
   static public final AVD mobileAVD =
     new AVD("Processing-0" + Base.getRevision(),
-            AndroidBuild.target_platform, SysImageDownloader.SYSTEM_IMAGE_TAG, DEFAULT_SKIN);
+            AndroidBuild.TARGET_PLATFORM, SysImageDownloader.SYSTEM_IMAGE_TAG, DEFAULT_SKIN);
 //            "Google Inc.:Google APIs:" + AndroidBuild.sdkVersion);
 
   /** Default virtual wear device used by Processing. */
   static public final AVD wearAVD =
     new AVD("Processing-Wear-0" + Base.getRevision(),
-            AndroidBuild.target_platform, SysImageDownloader.SYSTEM_IMAGE_WEAR_TAG, WEAR_SKIN);  
+            AndroidBuild.TARGET_PLATFORM, SysImageDownloader.SYSTEM_IMAGE_WEAR_TAG, WEAR_SKIN);  
 
   public AVD(final String name, final String target, 
       final String tag, final String skin) {
@@ -243,7 +243,7 @@ protected void initTargets(final AndroidSDK sdk) throws IOException {
   protected boolean noTargets(final AndroidSDK sdk) throws IOException {
     initTargets(sdk); 
 //    return preferredAbi.size() == 0;
-    return preferredAbi.get(AndroidBuild.target_sdk) == null;
+    return preferredAbi.get(AndroidBuild.TARGET_SDK) == null;
   }
 
 
@@ -257,7 +257,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       "-t", target,
       "-c", DEFAULT_SDCARD_SIZE,
       "-s", skin,
-      "--abi", preferredAbi.get(AndroidBuild.target_sdk)
+      "--abi", preferredAbi.get(AndroidBuild.TARGET_SDK)
     };
 
     // sdk/tools/android create avd -n "Wear-Processing-0254" -t android-23 -c 64M -s AndroidWearSquare --abi android-wear/x86
@@ -279,7 +279,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       } else {
         // Just generally not working
         AndroidUtil.showMessage(AVD_CREATE_TITLE, 
-                                String.format(AVD_CREATE_MESSAGE, AndroidBuild.target_sdk));
+                                String.format(AVD_CREATE_MESSAGE, AndroidBuild.TARGET_SDK));
         System.out.println(createAvdResult);
       }
       //System.err.println(createAvdResult);
@@ -339,7 +339,7 @@ static public boolean ensureProperAVD(final Frame window, final AndroidMode mode
     } catch (final Exception e) {
       e.printStackTrace();
       AndroidUtil.showMessage(AVD_CREATE_TITLE, 
-                              String.format(AVD_CREATE_MESSAGE, AndroidBuild.target_sdk));
+                              String.format(AVD_CREATE_MESSAGE, AndroidBuild.TARGET_SDK));
     }
     return false;
   }