processing
diff --git a/‎core/src/processing/android/ActivityAPI.java‎
Lines changed: 3 additions & 3 deletions b/‎core/src/processing/android/ActivityAPI.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎core/src/processing/android/PFragment.java‎
Lines changed: 26 additions & 1 deletion b/‎core/src/processing/android/PFragment.java‎
Lines changed: 26 additions & 1 deletion
diff --git a/‎core/src/processing/core/PApplet.java‎
Lines changed: 4 additions & 4 deletions b/‎core/src/processing/core/PApplet.java‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎core/src/processing/core/PSurface.java‎
Lines changed: 2 additions & 0 deletions b/‎core/src/processing/core/PSurface.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎core/src/processing/core/PSurfaceNone.java‎
Lines changed: 9 additions & 0 deletions b/‎core/src/processing/core/PSurfaceNone.java‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎templates/FragmentActivity.java.tmpl‎
Lines changed: 1 addition & 1 deletion b/‎templates/FragmentActivity.java.tmpl‎
Lines changed: 1 addition & 1 deletion
@@ -16,9 +16,9 @@ public interface ActivityAPI {
   public void onActivityResult(int requestCode, int resultCode, Intent data);
   public void onNewIntent(Intent intent);
 
-  void onCreateOptionsMenu(Menu menu, MenuInflater inflater);
-  boolean onOptionsItemSelected(MenuItem item);
+  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater);
+  public boolean onOptionsItemSelected(MenuItem item);
   public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo);
   public boolean onContextItemSelected(MenuItem item);
-  public boolean onMenuItemClick(MenuItem item);
+  public void setHasOptionsMenu(boolean hasMenu);
 }
@@ -35,12 +35,16 @@
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.ContextMenu;
 import android.view.Display;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-
+import android.view.ContextMenu.ContextMenuInfo;
 import processing.core.PApplet;
 
 public class PFragment extends Fragment implements AppComponent {
@@ -225,6 +229,27 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     if (sketch != null) sketch.onActivityResult(requestCode, resultCode, data);
   }
 
+  @Override
+  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    if (sketch != null) sketch.onCreateOptionsMenu(menu, inflater);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item){
+    if (sketch != null) return sketch.onOptionsItemSelected(item);
+    return super.onOptionsItemSelected(item);
+  }
+
+  @Override
+  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+    if (sketch != null) sketch.onCreateContextMenu(menu, v, menuInfo);
+  }
+
+  @Override
+  public boolean onContextItemSelected(MenuItem item) {
+    if (sketch != null) return sketch.onContextItemSelected(item);
+    return super.onContextItemSelected(item);
+  }
 
   @Override
   public void onConfigurationChanged(Configuration newConfig) {
 
@@ -64,8 +64,8 @@
 
 public class PApplet extends Object implements ActivityAPI, PConstants {
 
-  static final public boolean DEBUG = true;
-//  static final public boolean DEBUG = false;
+//  static final public boolean DEBUG = true;
+  static final public boolean DEBUG = false;
 
   // Convenience public constant holding the SDK version, akin to platform in Java mode
   static final public int SDK = Build.VERSION.SDK_INT;
@@ -619,8 +619,8 @@ public boolean onContextItemSelected(MenuItem item) {
   }
 
 
-  public boolean onMenuItemClick(MenuItem item) {
-    return false;
+  public void setHasOptionsMenu(boolean hasMenu) {
+    surface.setHasOptionsMenu(hasMenu);
   }
 
 
 
@@ -76,6 +76,8 @@ public void initView(int sketchWidth, int sketchHeight, boolean parentSize,
 
   public void setOrientation(int which);
 
+  public void setHasOptionsMenu(boolean hasMenu);
+
   public File getFilesDir();
 
   public File getFileStreamPath(String path);
 
@@ -51,6 +51,7 @@
 import java.io.InputStream;
 
 import processing.android.AppComponent;
+import processing.android.PFragment;
 import processing.android.ServiceEngine;
 import processing.android.PermissionRequestor;
 
@@ -287,6 +288,14 @@ public void setOrientation(int which) {
   }
 
 
+  public void setHasOptionsMenu(boolean hasMenu) {
+    if (component.getKind() == AppComponent.FRAGMENT) {
+      ((PFragment)component).setHasOptionsMenu(hasMenu);
+    }
+  }
+
+
+
   @Override
   public File getFilesDir() {
     if (component.getKind() == AppComponent.FRAGMENT) {
 
@@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity {
   }  
 
   @Override
-  void onNewIntent(Intent intent) {
+  public void onNewIntent(Intent intent) {
     if (sketch != null) {
       sketch.onNewIntent(intent);
     }
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@`
`64`	`64`
`65`	`65`	`public class PApplet extends Object implements ActivityAPI, PConstants {`
`66`	`66`
`67`		`- static final public boolean DEBUG = true;`
`68`		`-// static final public boolean DEBUG = false;`
	`67`	`+// static final public boolean DEBUG = true;`
	`68`	`+ static final public boolean DEBUG = false;`
`69`	`69`
`70`	`70`	`// Convenience public constant holding the SDK version, akin to platform in Java mode`
`71`	`71`	`static final public int SDK = Build.VERSION.SDK_INT;`
`@@ -619,8 +619,8 @@ public boolean onContextItemSelected(MenuItem item) {`
`619`	`619`	`}`
`620`	`620`
`621`	`621`
`622`		`- public boolean onMenuItemClick(MenuItem item) {`
`623`		`- return false;`
	`622`	`+ public void setHasOptionsMenu(boolean hasMenu) {`
	`623`	`+ surface.setHasOptionsMenu(hasMenu);`
`624`	`624`	`}`
`625`	`625`
`626`	`626`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- void onNewIntent(Intent intent) {`
	`40`	`+ public void onNewIntent(Intent intent) {`
`41`	`41`	`if (sketch != null) {`
`42`	`42`	`sketch.onNewIntent(intent);`
`43`	`43`	`}`