added a few missing key constants

Author: codeanticode

core/src/processing/android/CompatUtils.java

@@ -22,14 +22,16 @@
 
 package processing.android;
 
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicInteger;
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.View;
 import android.graphics.Point;
-
+import android.view.PixelCopy;
 
 /**
  * Compatibility utilities that work across versions of Android. Even though
@@ -55,7 +57,7 @@ static public void getDisplayParams(Display display,
     if (Build.VERSION_CODES.JELLY_BEAN_MR1 <= Build.VERSION.SDK_INT) {
       display.getRealMetrics(metrics);
       display.getRealSize(size);
-    } if (Build.VERSION_CODES.ICE_CREAM_SANDWICH  <= Build.VERSION.SDK_INT) {
+    } if (Build.VERSION_CODES.ICE_CREAM_SANDWICH <= Build.VERSION.SDK_INT) {
       display.getMetrics(metrics);
       // Use undocumented methods getRawWidth, getRawHeight
       try {
@@ -79,7 +81,7 @@ static public void getDisplayParams(Display display,
    */
   @SuppressLint("NewApi")
   static public int getUniqueViewId() {
-    if (Build.VERSION_CODES.JELLY_BEAN_MR1 < Build.VERSION.SDK_INT) {
+    if (Build.VERSION_CODES.JELLY_BEAN_MR1 <= Build.VERSION.SDK_INT) {
       return View.generateViewId();
     } else {
       for (;;) {
@@ -93,4 +95,18 @@ static public int getUniqueViewId() {
       }
     }
   }
+
+
+  /**
+   * This method returns the UTF-8 charset
+   * @return UTF-8 charset
+   */
+  @SuppressLint("NewApi")
+  static public Charset getCharsetUTF8() {
+    if (Build.VERSION_CODES.KITKAT <= Build.VERSION.SDK_INT) {
+      return StandardCharsets.UTF_8;
+    } else {
+      return Charset.forName("UTF-8");
+    }
+  }
 }

core/src/processing/core/PApplet.java

@@ -58,6 +58,7 @@
 import processing.a2d.PGraphicsAndroid2D;
 import processing.android.ActivityAPI;
 import processing.android.AppComponent;
+import processing.android.CompatUtils;
 import processing.data.*;
 import processing.event.*;
 import processing.opengl.*;
@@ -2492,8 +2493,6 @@ protected void nativeKeyEvent(android.view.KeyEvent event) {
     // TODO set up proper key modifier handling
     int keModifiers = 0;
 
-//    KeyEvent ke = new KeyEvent(event, event.getEventTime(),
-//                               keAction, keModifiers, key, keyCode);
     KeyEvent ke = new KeyEvent(event, event.getEventTime(),
                                keAction, keModifiers, key, keyCode, 0 < event.getRepeatCount());
 
@@ -4776,7 +4775,7 @@ static public BufferedReader createReader(File file) {
    */
   static public BufferedReader createReader(InputStream input) {
     InputStreamReader isr =
-      new InputStreamReader(input, StandardCharsets.UTF_8);
+      new InputStreamReader(input, CompatUtils.getCharsetUTF8());
 
     BufferedReader reader = new BufferedReader(isr);
     // consume the Unicode BOM (byte order marker) if present
@@ -4834,7 +4833,7 @@ static public PrintWriter createWriter(File file) {
   static public PrintWriter createWriter(OutputStream output) {
     BufferedOutputStream bos = new BufferedOutputStream(output, 8192);
     OutputStreamWriter osw =
-      new OutputStreamWriter(bos, StandardCharsets.UTF_8);
+      new OutputStreamWriter(bos, CompatUtils.getCharsetUTF8());
     return new PrintWriter(osw);
   }
 

core/src/processing/core/PConstants.java

@@ -349,12 +349,12 @@ public interface PConstants {
   // for 0125, these were changed to 'char' values, because they
   // can be upgraded to ints automatically by Java, but having them
   // as ints prevented split(blah, TAB) from working
-  static final char BACKSPACE = 8;
-  static final char TAB       = 9;
-  static final char ENTER     = 10;
-  static final char RETURN    = 13;
-  static final char ESC       = 27;
-  static final char DELETE    = 127;
+  static final char BACKSPACE = KeyEvent.KEYCODE_DEL;
+  static final char TAB       = KeyEvent.KEYCODE_TAB;
+  static final char ENTER     = KeyEvent.KEYCODE_ENTER;
+  static final char RETURN    = KeyEvent.KEYCODE_ENTER;
+  static final char ESC       = KeyEvent.KEYCODE_ESCAPE;
+  static final char DELETE    = KeyEvent.KEYCODE_DEL;
 
   // i.e. if ((key == CODED) && (keyCode == UP))
   static final int CODED     = 0xffff;
@@ -376,8 +376,7 @@ public interface PConstants {
   // key will be CODED and keyCode will be this value
 //  static final int ALT       = KeyEvent.VK_ALT;
 //  static final int CONTROL   = KeyEvent.VK_CONTROL;
-//  static final int SHIFT     = KeyEvent.VK_SHIFT;
-
+  static final int SHIFT     = KeyEvent.KEYCODE_SHIFT_LEFT;
 
   // cursor types