Merge remote-tracking branch 'origin/5.12' into 5.12.1

 Conflicts:
	src/widgets/kernel/qtooltip.cpp

Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8

2 files changed, 122 insertions, 11 deletions

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 adc67e93fb..5562c010aa 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -47,6 +47,7 @@ import java.util.concurrent.Semaphore;
 import android.app.Activity;
 import android.app.Service;
 import android.content.Context;
+import android.content.ContentResolver;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ActivityInfo;
@@ -57,6 +58,7 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.content.ClipboardManager;
 import android.content.ClipboardManager.OnPrimaryClipChangedListener;
+import android.content.ClipData;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
@@ -98,7 +100,9 @@ public class QtNative
     private static ClipboardManager m_clipboardManager = null;
     private static Method m_checkSelfPermissionMethod = null;
     private static Boolean m_tabletEventSupported = null;
+    private static boolean m_usePrimaryClip = false;
     public static QtThread m_qtThread = new QtThread();
+    private static Method m_addItemMethod = null;
     private static final Runnable runPendingCppRunnablesRunnable = new Runnable() {
         @Override
         public void run() {
@@ -697,26 +701,133 @@ public class QtNative
         }
     }
 
+    private static void clearClipData()
+    {
+        m_usePrimaryClip = false;
+    }
     private static void setClipboardText(String text)
     {
-        if (m_clipboardManager != null)
-            m_clipboardManager.setText(text);
+        if (m_clipboardManager != null) {
+            ClipData clipData = ClipData.newPlainText("text/plain", text);
+            updatePrimaryClip(clipData);
+        }
     }
 
     public static boolean hasClipboardText()
     {
-        if (m_clipboardManager != null)
-            return m_clipboardManager.hasText();
-        else
-            return false;
+        if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
+            ClipData primaryClip = m_clipboardManager.getPrimaryClip();
+            for (int i = 0; i < primaryClip.getItemCount(); ++i)
+                if (primaryClip.getItemAt(i).getText() != null)
+                    return true;
+        }
+        return false;
     }
 
     private static String getClipboardText()
     {
-        if (m_clipboardManager != null)
-            return m_clipboardManager.getText().toString();
-        else
-            return "";
+        if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
+            ClipData primaryClip = m_clipboardManager.getPrimaryClip();
+            for (int i = 0; i < primaryClip.getItemCount(); ++i)
+                if (primaryClip.getItemAt(i).getText() != null)
+                    return primaryClip.getItemAt(i).getText().toString();
+        }
+        return "";
+    }
+
+    private static void updatePrimaryClip(ClipData clipData)
+    {
+        if (m_usePrimaryClip) {
+            ClipData clip = m_clipboardManager.getPrimaryClip();
+            if (Build.VERSION.SDK_INT >= 26) {
+                if (m_addItemMethod == null) {
+                    Class[] cArg = new Class[2];
+                    cArg[0] = ContentResolver.class;
+                    cArg[1] = ClipData.Item.class;
+                    try {
+                        m_addItemMethod = m_clipboardManager.getClass().getMethod("addItem", cArg);
+                    } catch (Exception e) {
+                    }
+                }
+            }
+            if (m_addItemMethod != null) {
+                try {
+                    m_addItemMethod.invoke(m_activity.getContentResolver(), clipData.getItemAt(0));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                clip.addItem(clipData.getItemAt(0));
+            }
+            m_clipboardManager.setPrimaryClip(clip);
+        } else {
+            m_clipboardManager.setPrimaryClip(clipData);
+            m_usePrimaryClip = true;
+        }
+    }
+
+    private static void setClipboardHtml(String text, String html)
+    {
+        if (m_clipboardManager != null) {
+            ClipData clipData = ClipData.newHtmlText("text/html", text, html);
+            updatePrimaryClip(clipData);
+        }
+    }
+
+    public static boolean hasClipboardHtml()
+    {
+        if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
+            ClipData primaryClip = m_clipboardManager.getPrimaryClip();
+            for (int i = 0; i < primaryClip.getItemCount(); ++i)
+                if (primaryClip.getItemAt(i).getHtmlText() != null)
+                    return true;
+        }
+        return false;
+    }
+
+    private static String getClipboardHtml()
+    {
+        if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
+            ClipData primaryClip = m_clipboardManager.getPrimaryClip();
+            for (int i = 0; i < primaryClip.getItemCount(); ++i)
+                if (primaryClip.getItemAt(i).getHtmlText() != null)
+                    return primaryClip.getItemAt(i).getHtmlText().toString();
+        }
+        return "";
+    }
+
+    private static void setClipboardUri(String uriString)
+    {
+        if (m_clipboardManager != null) {
+            ClipData clipData = ClipData.newUri(m_activity.getContentResolver(), "text/uri-list",
+                                                Uri.parse(uriString));
+            updatePrimaryClip(clipData);
+        }
+    }
+
+    public static boolean hasClipboardUri()
+    {
+        if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
+            ClipData primaryClip = m_clipboardManager.getPrimaryClip();
+            for (int i = 0; i < primaryClip.getItemCount(); ++i)
+                if (primaryClip.getItemAt(i).getUri() != null)
+                    return true;
+        }
+        return false;
+    }
+
+    private static String[] getClipboardUris()
+    {
+        ArrayList<String> uris = new ArrayList<String>();
+        if (m_clipboardManager != null && m_clipboardManager.hasPrimaryClip()) {
+            ClipData primaryClip = m_clipboardManager.getPrimaryClip();
+            for (int i = 0; i < primaryClip.getItemCount(); ++i)
+                if (primaryClip.getItemAt(i).getUri() != null)
+                    uris.add(primaryClip.getItemAt(i).getUri().toString());
+        }
+        String[] strings = new String[uris.size()];
+        strings = uris.toArray(strings);
+        return strings;
     }
 
     private static void openContextMenu(final int x, final int y, final int w, final int h)
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle
index fcd8ae345d..989d0792cf 100644
--- a/src/android/templates/build.gradle
+++ b/src/android/templates/build.gradle
@@ -17,7 +17,7 @@ repositories {
 apply plugin: 'com.android.application'
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 }
 
 android {