Update Android port

* doc/emacs/android.texi (Android File System): Describe an
easier way to disable scoped storage.
* java/AndroidManifest.xml.in: Add new permission to allow that.
* java/README: Add more text describing Java.
* java/org/gnu/emacs/EmacsContextMenu.java (Item): New fields
`isCheckable' and `isChecked'.
(EmacsContextMenu, addItem): New arguments.
(inflateMenuItems): Set checked status as appropriate.

* java/org/gnu/emacs/EmacsCopyArea.java (perform): Disallow
operations where width and height are less than or equal to
zero.
* lisp/menu-bar.el (menu-bar-edit-menu): Make
execute-extended-command available as a menu item.
* src/androidmenu.c (android_init_emacs_context_menu)
(android_menu_show):
* src/menu.c (have_boxes): Implement menu check boxes.

2 files changed, 15 insertions, 4 deletions

diff --git a/src/androidmenu.c b/src/androidmenu.c
index 7b27825ad60..acad775f26a 100644
--- a/src/androidmenu.c
+++ b/src/androidmenu.c
@@ -98,7 +98,7 @@ android_init_emacs_context_menu (void)
   FIND_METHOD_STATIC (create_context_menu, "createContextMenu",
                       "(Ljava/lang/String;)Lorg/gnu/emacs/EmacsContextMenu;");
 
-  FIND_METHOD (add_item, "addItem", "(ILjava/lang/String;Z)V");
+  FIND_METHOD (add_item, "addItem", "(ILjava/lang/String;ZZZ)V");
   FIND_METHOD (add_submenu, "addSubmenu", "(Ljava/lang/String;"
                "Ljava/lang/String;)Lorg/gnu/emacs/EmacsContextMenu;");
   FIND_METHOD (add_pane, "addPane", "(Ljava/lang/String;)V");
@@ -241,7 +241,7 @@ android_menu_show (struct frame *f, int x, int y, int menuflags,
   Lisp_Object pane_name, prefix;
   const char *pane_string;
   specpdl_ref count, count1;
-  Lisp_Object item_name, enable, def, tem, entry;
+  Lisp_Object item_name, enable, def, tem, entry, type, selected;
   jmethodID method;
   jobject store;
   bool rc;
@@ -250,6 +250,7 @@ android_menu_show (struct frame *f, int x, int y, int menuflags,
   struct android_dismiss_menu_data data;
   struct android_menu_subprefix *subprefix, *temp_subprefix;
   struct android_menu_subprefix *subprefix_1;
+  bool checkmark;
 
   count = SPECPDL_INDEX ();
 
@@ -351,6 +352,8 @@ android_menu_show (struct frame *f, int x, int y, int menuflags,
           item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
           enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
           def = AREF (menu_items, i + MENU_ITEMS_ITEM_DEFINITION);
+          type = AREF (menu_items, i + MENU_ITEMS_ITEM_TYPE);
+          selected = AREF (menu_items, i + MENU_ITEMS_ITEM_SELECTED);
 
           /* This is an actual menu item (or submenu).  Add it to the
              menu.  */
@@ -392,12 +395,20 @@ android_menu_show (struct frame *f, int x, int y, int menuflags,
               title_string = (!NILP (item_name)
                               ? android_build_string (item_name)
                               : NULL);
+
+              /* Determine whether or not to display a check box.  */
+
+              checkmark = (EQ (type, QCtoggle)
+                           || EQ (type, QCradio));
+
               (*android_java_env)->CallVoidMethod (android_java_env,
                                                    current_context_menu,
                                                    menu_class.add_item,
                                                    (jint) item_id,
                                                    title_string,
-                                                   (jboolean) !NILP (enable));
+                                                   (jboolean) !NILP (enable),
+                                                   (jboolean) checkmark,
+                                                   (jboolean) !NILP (selected));
               android_exception_check ();
 
               if (title_string)
diff --git a/src/menu.c b/src/menu.c
index e02ee880119..6ab34a16996 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -48,7 +48,7 @@ static bool
 have_boxes (void)
 {
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) || defined (HAVE_NS) \
-  || defined (HAVE_HAIKU)
+  || defined (HAVE_HAIKU) || defined (HAVE_ANDROID)
   if (FRAME_WINDOW_P (XFRAME (Vmenu_updating_frame)))
     return 1;
 #endif