Handle back an touch events properly

Signed-off-by: Umair Khan <[email protected]>

Author: omerjerk

core/src/processing/core/PApplet.java

@@ -846,6 +846,7 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
+      super.onWindowFocusChanged(hasFocus);
       surfaceWindowFocusChanged(hasFocus);
     }
 
@@ -858,13 +859,15 @@ public boolean onTouchEvent(MotionEvent event) {
 
     @Override
     public boolean onKeyDown(int code, android.view.KeyEvent event) {
-      return surfaceKeyDown(code, event);
+      surfaceKeyDown(code, event);
+      return super.onKeyDown(code, event);
     }
 
 
     @Override
     public boolean onKeyUp(int code, android.view.KeyEvent event) {
-      return surfaceKeyUp(code, event);
+      surfaceKeyUp(code, event);
+      return super.onKeyUp(code, event);
     }
 
 
@@ -1011,6 +1014,7 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
      */
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
+      super.onWindowFocusChanged(hasFocus);
       surfaceWindowFocusChanged(hasFocus);
 //      super.onWindowFocusChanged(hasFocus);
 //      focused = hasFocus;
@@ -1032,13 +1036,15 @@ public boolean onTouchEvent(MotionEvent event) {
 
     @Override
     public boolean onKeyDown(int code, android.view.KeyEvent event) {
-      return surfaceKeyDown(code, event);
+      surfaceKeyDown(code, event);
+      return super.onKeyDown(code, event);
     }
 
 
     @Override
     public boolean onKeyUp(int code, android.view.KeyEvent event) {
-      return surfaceKeyUp(code, event);
+      surfaceKeyUp(code, event);
+      return super.onKeyUp(code, event);
     }
 
 
@@ -1059,7 +1065,6 @@ public boolean onKeyUp(int code, android.view.KeyEvent event) {
    * by Android as well.
    */
   public void surfaceWindowFocusChanged(boolean hasFocus) {
-    super.onWindowFocusChanged(hasFocus);
     focused = hasFocus;
     if (focused) {
       focusGained();
@@ -1081,17 +1086,17 @@ public boolean surfaceTouchEvent(MotionEvent event) {
   }
 
 
-  public boolean surfaceKeyDown(int code, android.view.KeyEvent event) {
+  public void surfaceKeyDown(int code, android.view.KeyEvent event) {
     //  System.out.println("got onKeyDown for " + code + " " + event);
     nativeKeyEvent(event);
-    return super.onKeyDown(code, event);
+//    return super.onKeyDown(code, event);
   }
 
 
-  public boolean surfaceKeyUp(int code, android.view.KeyEvent event) {
+  public void surfaceKeyUp(int code, android.view.KeyEvent event) {
     //  System.out.println("got onKeyUp for " + code + " " + event);
     nativeKeyEvent(event);
-    return super.onKeyUp(code, event);
+//    return super.onKeyUp(code, event);
   }
 
 
@@ -2906,7 +2911,6 @@ protected void handleKeyEvent(KeyEvent event) {
   }
 
 
-  @Override
   public void onBackPressed() {
 	  exit();
   }

core/src/processing/core/PGraphicsAndroid2D.java

@@ -1059,7 +1059,7 @@ protected void imageImpl(PImage src,
     // but I don't think it is particularly efficient, as the bitmaps are stored
     // in native heap for Android 10 and older.
     MemoryInfo mi = new MemoryInfo();
-    ActivityManager activityManager = (ActivityManager) parent.getApplicationContext().getSystemService(android.content.Context.ACTIVITY_SERVICE);
+    ActivityManager activityManager = (ActivityManager) parent.getActivity().getSystemService(android.content.Context.ACTIVITY_SERVICE);
     activityManager.getMemoryInfo(mi);
     if (mi.lowMemory) {
       src.bitmap.recycle();

src/processing/mode/android/AndroidBuild.java

@@ -869,6 +869,7 @@ private void writeMainActivity(final File file) {
     writer.println("package " + basePackage + "." + sketch.getName());
     writer.println("import android.app.Activity;");
     writer.println("public class TestActivity extends Activity {");
+    writer.println("    PApplet fragment;");
     writer.println("    @Override");
     writer.println("    protected void onCreate(Bundle savedInstanceState) {");
     writer.println("        super.onCreate(savedInstanceState);");
@@ -878,7 +879,19 @@ private void writeMainActivity(final File file) {
         + "WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);");
     writer.println("window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,"
         + "WindowManager.LayoutParams.FLAG_FULLSCREEN);");
-    writer.println("        setContentView(R.layout.main);");
+    writer.println("        FrameLayout frame = new FrameLayout(this)");
+    writer.println("        setContentView(frame, new LayoutParams(LayoutParams.MATCH_PARENT, "
+        + "LayoutParams.MATCH_PARENT));");
+    writer.println("        if (savedInstanceState == null) {");
+    writer.println("            fragment = new " + sketchClassName + "()");
+    writer.println("            FragmentTransaction ft = getFragmentManager().beginTransaction();");
+    writer.println("            ft.add(frame.getId(), fragment).commit();");
+    writer.println("        }");
+    writer.println("    }");
+    writer.println("    @Override");
+    writer.println("    public void onBackPressed() {");
+    writer.println("        fragment.onBackPressed();");
+    writer.println("        super.onBackPressed()");
     writer.println("    }");
     writer.println("}");
     writer.flush();