summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2016-08-04 16:40:07 +0200
committerOlivier Goffart (Woboq GmbH) <ogoffart@woboq.com>2016-08-21 20:17:45 +0000
commite0e9e196a72ffe5457034894eaaadc90ed0d34ef (patch)
tree4ad770f481762b41f3cd84d7fcc1510414af556a /src/android
parent89c235ca8295db1a946f3af5ba4a813e12a6c0be (diff)
Android: Show the edit menu when things are selected
Change-Id: I3647fa39469c87bcc08bb439546e5e61c535c71d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/EditMenu.java142
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java155
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java33
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/QtNative.java2
4 files changed, 327 insertions, 5 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/EditMenu.java b/src/android/jar/src/org/qtproject/qt5/android/EditMenu.java
new file mode 100644
index 0000000000..afe7797914
--- /dev/null
+++ b/src/android/jar/src/org/qtproject/qt5/android/EditMenu.java
@@ -0,0 +1,142 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Android port of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+package org.qtproject.qt5.android;
+
+import android.view.ActionMode;
+import android.view.ActionMode.Callback;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+
+/**
+ * The edit menu actions (when there is selection)
+ */
+class EditMenu implements ActionMode.Callback {
+
+ private final Activity m_activity;
+ private ActionMode m_actionMode;
+
+ public EditMenu(Activity activity) {
+ m_activity = activity;
+ }
+
+ @Override
+ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+ mode.setTitle(null);
+ mode.setSubtitle(null);
+ mode.setTitleOptionalHint(true);
+
+ Context context = m_activity;
+ int[] attrs = {
+ android.R.attr.actionModeSelectAllDrawable, android.R.attr.actionModeCutDrawable,
+ android.R.attr.actionModeCopyDrawable, android.R.attr.actionModePasteDrawable
+ };
+ TypedArray a = context.getTheme().obtainStyledAttributes(attrs);
+
+ menu.add(Menu.NONE, android.R.id.selectAll, Menu.NONE, android.R.string.selectAll)
+ .setIcon(a.getResourceId(0, 0))
+ .setAlphabeticShortcut('a')
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+ menu.add(Menu.NONE, android.R.id.cut, Menu.NONE, android.R.string.cut)
+ .setIcon(a.getResourceId(1, 0))
+ .setAlphabeticShortcut('x')
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+ menu.add(Menu.NONE, android.R.id.copy, Menu.NONE, android.R.string.copy)
+ .setIcon(a.getResourceId(2, 0))
+ .setAlphabeticShortcut('c')
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+ menu.add(Menu.NONE, android.R.id.paste, Menu.NONE, android.R.string.paste)
+ .setIcon(a.getResourceId(3, 0))
+ .setAlphabeticShortcut('v')
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+ return true;
+ }
+
+ @Override
+ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+ return true;
+ }
+
+ @Override
+ public void onDestroyActionMode(ActionMode mode) {
+ m_actionMode = null;
+ }
+
+ @Override
+ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+
+ switch (item.getItemId()) {
+ case android.R.id.cut:
+ return QtNativeInputConnection.cut();
+ case android.R.id.copy:
+ return QtNativeInputConnection.copy();
+ case android.R.id.paste:
+ return QtNativeInputConnection.paste();
+ case android.R.id.selectAll:
+ return QtNativeInputConnection.selectAll();
+ }
+ return false;
+ }
+
+ public void hide()
+ {
+ if (m_actionMode != null) {
+ m_actionMode.finish();
+ }
+ }
+
+ public void show()
+ {
+ if (m_actionMode == null) {
+ m_actionMode = m_activity.startActionMode(this);
+ }
+ }
+
+ public boolean isShown()
+ {
+ return m_actionMode != null;
+ }
+}
diff --git a/src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java b/src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java
new file mode 100644
index 0000000000..246be1aeb2
--- /dev/null
+++ b/src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java
@@ -0,0 +1,155 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Android port of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+package org.qtproject.qt5.android;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.ImageView;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.view.MotionEvent;
+import android.widget.PopupWindow;
+import android.app.Activity;
+import android.view.ViewTreeObserver;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup.LayoutParams;
+import android.view.ViewGroup;
+
+// Helper class that manages a cursor or selection handle
+public class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, OnClickListener
+{
+ private View m_layout = null;
+ private View m_view = null;
+ private PopupWindow m_popup = null;
+ private Activity m_activity;
+ private int m_posX;
+ private int m_posY;
+
+ public EditPopupMenu(Activity activity, View layout) {
+ m_activity = activity;
+ m_layout = layout;
+ }
+
+ private boolean initOverlay(){
+ if (m_popup == null){
+ Context context = m_layout.getContext();
+ int[] attrs = { android.R.attr.textEditPasteWindowLayout };
+ TypedArray a = context.getTheme().obtainStyledAttributes(attrs);
+ final int layout = a.getResourceId(0, 0);
+ LayoutInflater inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ m_view = inflater.inflate(layout, null);
+
+ final int size = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+ m_view.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT));
+ m_view.measure(size, size);
+ m_view.setOnClickListener(this);
+
+ m_popup = new PopupWindow(context, null, android.R.attr.textSelectHandleWindowStyle);
+ m_popup.setSplitTouchEnabled(true);
+ m_popup.setClippingEnabled(false);
+ m_popup.setContentView(m_view);
+ m_popup.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+ m_popup.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+
+ m_layout.getViewTreeObserver().addOnPreDrawListener(this);
+ }
+ return true;
+ }
+
+ public int getHeight()
+ {
+ initOverlay();
+ return m_view.getHeight();
+ }
+
+ // Show the handle at a given position (or move it if it is already shown)
+ public void setPosition(final int x, final int y){
+ initOverlay();
+
+ final int[] location = new int[2];
+ m_layout.getLocationOnScreen(location);
+
+ int x2 = x + location[0];
+ int y2 = y + location[1];
+
+ x2 -= m_view.getWidth() / 2 ;
+ if (x2 < 0)
+ x2 = 0;
+ y2 -= m_view.getHeight();
+
+ if (m_popup.isShowing())
+ m_popup.update(x2, y2, -1, -1);
+ else
+ m_popup.showAtLocation(m_layout, 0, x2, y2);
+
+ m_posX = x;
+ m_posY = y;
+
+ }
+
+ public void hide() {
+ if (m_popup != null) {
+ m_popup.dismiss();
+ }
+ }
+
+ @Override
+ public boolean onPreDraw() {
+ // This hook is called when the view location is changed
+ // For example if the keyboard appears.
+ // Adjust the position of the handle accordingly
+ if (m_popup != null && m_popup.isShowing())
+ setPosition(m_posX, m_posY);
+
+ return true;
+ }
+
+ @Override
+ public void onClick(View v) {
+ QtNativeInputConnection.paste();
+ hide();
+ }
+}
+
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index 55de75e991..b602cabd27 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -147,6 +147,8 @@ public class QtActivityDelegate
private CursorHandle m_cursorHandle;
private CursorHandle m_leftSelectionHandle;
private CursorHandle m_rightSelectionHandle;
+ private EditMenu m_editMenu;
+ private EditPopupMenu m_editPopupMenu;
public void setFullScreen(boolean enterFullScreen)
{
@@ -478,11 +480,11 @@ public class QtActivityDelegate
private static final int CursorHandleNotShown = 0;
private static final int CursorHandleShowNormal = 1;
private static final int CursorHandleShowSelection = 2;
+ private static final int CursorHandleShowPopup = 3;
/* called from the C++ code when the position of the cursor or selection handles needs to
- be adjusted
-
- mode is one of QAndroidInputContext::CursorHandleShowMode)
+ be adjusted.
+ mode is one of QAndroidInputContext::CursorHandleShowMode
*/
public void updateHandles(int mode, int x1, int y1, int x2, int y2)
{
@@ -493,7 +495,11 @@ public class QtActivityDelegate
m_rightSelectionHandle.hide();
m_leftSelectionHandle.hide();
}
- } else if (mode == CursorHandleShowNormal) {
+ if (m_editMenu != null)
+ m_editMenu.hide();
+ if (m_editPopupMenu != null)
+ m_editPopupMenu.hide();
+ } else if (mode == CursorHandleShowNormal || mode == CursorHandleShowPopup) {
if (m_cursorHandle == null) {
m_cursorHandle = new CursorHandle(m_activity, m_layout, QtNative.IdCursorHandle,
android.R.attr.textSelectHandle);
@@ -514,7 +520,26 @@ public class QtActivityDelegate
m_rightSelectionHandle.setPosition(x2,y2);
if (m_cursorHandle != null)
m_cursorHandle.hide();
+
+ if (m_editMenu == null)
+ m_editMenu = new EditMenu(m_activity);
+ m_editMenu.show();
+ }
+
+ // show the edit popup menu
+ if (mode == CursorHandleShowPopup && (m_editMenu == null || !m_editMenu.isShown())
+ && QtNative.hasClipboardText()) {
+ if (m_editPopupMenu == null)
+ m_editPopupMenu = new EditPopupMenu(m_activity, m_layout);
+ if (y2 < m_editPopupMenu.getHeight()) {
+ // If the popup cannot be shown over the text, it must be shown under the anchors
+ y2 = y1 + 2 * m_editPopupMenu.getHeight();
+ }
+ m_editPopupMenu.setPosition(x2, y2);
+ } else if (m_editPopupMenu != null) {
+ m_editPopupMenu.hide();
}
+
}
public boolean loadApplication(Activity activity, ClassLoader classLoader, Bundle loaderParams)
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index 6f4b0503d5..4df2cb88c9 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -583,7 +583,7 @@ public class QtNative
m_clipboardManager.setText(text);
}
- private static boolean hasClipboardText()
+ public static boolean hasClipboardText()
{
if (m_clipboardManager != null)
return m_clipboardManager.hasText();