diff --git a/ide/AndroidStudio3/AndroidStudio3.iml b/ide/AndroidStudio3/AndroidStudio3.iml
new file mode 100644
index 000000000..e1f575209
--- /dev/null
+++ b/ide/AndroidStudio3/AndroidStudio3.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="AndroidStudio3" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/Android/HelloAndroid/HelloAndroid.iml b/ide/AndroidStudio3/HelloAndroid.iml
similarity index 100%
rename from Android/HelloAndroid/HelloAndroid.iml
rename to ide/AndroidStudio3/HelloAndroid.iml
diff --git a/Android/HelloAndroid/README.md b/ide/AndroidStudio3/README.md
similarity index 100%
rename from Android/HelloAndroid/README.md
rename to ide/AndroidStudio3/README.md
diff --git a/Android/HelloAndroid/app/app.iml b/ide/AndroidStudio3/app/app.iml
similarity index 100%
rename from Android/HelloAndroid/app/app.iml
rename to ide/AndroidStudio3/app/app.iml
index a83784e31..ffb02d88c 100644
--- a/Android/HelloAndroid/app/app.iml
+++ b/ide/AndroidStudio3/app/app.iml
@@ -56,14 +56,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -72,6 +64,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
diff --git a/Android/HelloAndroid/app/build.gradle b/ide/AndroidStudio3/app/build.gradle
similarity index 100%
rename from Android/HelloAndroid/app/build.gradle
rename to ide/AndroidStudio3/app/build.gradle
diff --git a/Android/HelloAndroid/app/src/main/AndroidManifest.xml b/ide/AndroidStudio3/app/src/main/AndroidManifest.xml
similarity index 100%
rename from Android/HelloAndroid/app/src/main/AndroidManifest.xml
rename to ide/AndroidStudio3/app/src/main/AndroidManifest.xml
diff --git a/Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt b/ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt
similarity index 100%
rename from Android/HelloAndroid/app/src/main/cpp/CMakeLists.txt
rename to ide/AndroidStudio3/app/src/main/cpp/CMakeLists.txt
diff --git a/Android/HelloAndroid/app/src/main/cpp/HelloAndroid.cxx b/ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx
similarity index 100%
rename from Android/HelloAndroid/app/src/main/cpp/HelloAndroid.cxx
rename to ide/AndroidStudio3/app/src/main/cpp/HelloAndroid.cxx
diff --git a/Android/HelloAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ide/AndroidStudio3/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from Android/HelloAndroid/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to ide/AndroidStudio3/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/Android/HelloAndroid/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ide/AndroidStudio3/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from Android/HelloAndroid/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to ide/AndroidStudio3/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/Android/HelloAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ide/AndroidStudio3/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from Android/HelloAndroid/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to ide/AndroidStudio3/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/Android/HelloAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ide/AndroidStudio3/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from Android/HelloAndroid/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to ide/AndroidStudio3/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Android/HelloAndroid/app/src/main/res/values/strings.xml b/ide/AndroidStudio3/app/src/main/res/values/strings.xml
similarity index 100%
rename from Android/HelloAndroid/app/src/main/res/values/strings.xml
rename to ide/AndroidStudio3/app/src/main/res/values/strings.xml
diff --git a/Android/HelloAndroid/build.gradle b/ide/AndroidStudio3/build.gradle
similarity index 100%
rename from Android/HelloAndroid/build.gradle
rename to ide/AndroidStudio3/build.gradle
diff --git a/Android/HelloAndroid/gradle/wrapper/gradle-wrapper.jar b/ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from Android/HelloAndroid/gradle/wrapper/gradle-wrapper.jar
rename to ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.jar
diff --git a/Android/HelloAndroid/gradle/wrapper/gradle-wrapper.properties b/ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from Android/HelloAndroid/gradle/wrapper/gradle-wrapper.properties
rename to ide/AndroidStudio3/gradle/wrapper/gradle-wrapper.properties
diff --git a/Android/HelloAndroid/gradlew b/ide/AndroidStudio3/gradlew
similarity index 100%
rename from Android/HelloAndroid/gradlew
rename to ide/AndroidStudio3/gradlew
diff --git a/Android/HelloAndroid/gradlew.zip b/ide/AndroidStudio3/gradlew.zip
similarity index 100%
rename from Android/HelloAndroid/gradlew.zip
rename to ide/AndroidStudio3/gradlew.zip
diff --git a/Android/HelloAndroid/settings.gradle b/ide/AndroidStudio3/settings.gradle
similarity index 100%
rename from Android/HelloAndroid/settings.gradle
rename to ide/AndroidStudio3/settings.gradle
diff --git a/src/drivers/Android/Fl_Android_Application.cxx b/src/drivers/Android/Fl_Android_Application.cxx
index 59fa8483c..0219d66fe 100644
--- a/src/drivers/Android/Fl_Android_Application.cxx
+++ b/src/drivers/Android/Fl_Android_Application.cxx
@@ -397,9 +397,21 @@ void Fl_Android_Application::copy_screen()
     // TODO: there are endless possibilities to optimize the following code
     // We can identify previously written buffers and copy only those pixels
     // that actually changed.
-    memcpy(pNativeWindowBuffer.bits,
-           pApplicationWindowBuffer.bits,
-           600*800*2);
+    const uint16_t *src = (uint16_t*)pApplicationWindowBuffer.bits;
+    int srcStride = pApplicationWindowBuffer.stride;
+    int ww = pApplicationWindowBuffer.width;
+    int hh = pApplicationWindowBuffer.height;
+
+    uint16_t *dst = (uint16_t*)pNativeWindowBuffer.bits;
+    int dstStride = pNativeWindowBuffer.stride;
+    if (pNativeWindowBuffer.width<ww) ww = pNativeWindowBuffer.width;
+    if (pNativeWindowBuffer.height<ww) ww = pNativeWindowBuffer.height;
+
+    for (int row=hh; row>0; --row) {
+      memcpy(dst, src, size_t(ww * 2));
+      src += srcStride;
+      dst += dstStride;
+    }
     unlock_and_post_screen();
   }
 }