From 186294607f32c4ec8fcb32104af8516bed63e1da Mon Sep 17 00:00:00 2001
From: Maximilian Wagenbach <maximilian.wagenbach@native-instruments.de>
Date: Mon, 29 Jan 2018 22:35:04 +0100
Subject: [PATCH] Return correct key code for delete/backspace on android. Also
 increased minimum Android API version to 14.

---
 CMakeLists.txt                                | 4 ++--
 examples/android/AndroidManifest.xml          | 4 ++--
 examples/android/jni/Application.mk           | 2 +-
 src/SFML/Window/Android/WindowImplAndroid.cpp | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 403456bc..d78bca01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,8 +104,8 @@ endif()
 # Android options
 if(SFML_OS_ANDROID)
     # make sure there's the android library available
-    if (CMAKE_ANDROID_API LESS 9)
-        message(FATAL_ERROR "Android API level (${CMAKE_ANDROID_API}) must be equal or greater than 9.")
+    if (CMAKE_ANDROID_API LESS 14)
+        message(FATAL_ERROR "Android API level (${CMAKE_ANDROID_API}) must be equal or greater than 14.")
     endif()
 
     # CMake doesn't support defining the STL to be used with Nsight Tegra, so warn the user
diff --git a/examples/android/AndroidManifest.xml b/examples/android/AndroidManifest.xml
index edee84f4..da0ae20c 100644
--- a/examples/android/AndroidManifest.xml
+++ b/examples/android/AndroidManifest.xml
@@ -7,11 +7,11 @@
 
     <uses-feature android:glEsVersion="0x00010001" />
 
-    <uses-sdk android:minSdkVersion="9"
+    <uses-sdk android:minSdkVersion="14"
               android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.VIBRATE" />
-    
+
     <application android:label="@string/app_name"
                  android:icon="@drawable/sfml_logo"
                  android:hasCode="false"
diff --git a/examples/android/jni/Application.mk b/examples/android/jni/Application.mk
index 71828c8d..13ca3ea4 100644
--- a/examples/android/jni/Application.mk
+++ b/examples/android/jni/Application.mk
@@ -1,5 +1,5 @@
 NDK_TOOLCHAIN_VERSION := 4.9
-APP_PLATFORM := android-9
+APP_PLATFORM := android-14
 APP_STL := c++_shared
 APP_ABI := armeabi-v7a
 APP_MODULES := sfml-activity sfml-example
diff --git a/src/SFML/Window/Android/WindowImplAndroid.cpp b/src/SFML/Window/Android/WindowImplAndroid.cpp
index c973dd73..4a850f3b 100644
--- a/src/SFML/Window/Android/WindowImplAndroid.cpp
+++ b/src/SFML/Window/Android/WindowImplAndroid.cpp
@@ -620,7 +620,8 @@ Keyboard::Key WindowImplAndroid::androidKeyToSF(int32_t key)
         case AKEYCODE_EXPLORER:
         case AKEYCODE_ENVELOPE:           return Keyboard::Unknown;
         case AKEYCODE_ENTER:              return Keyboard::Return;
-        case AKEYCODE_DEL:                return Keyboard::Delete;
+        case AKEYCODE_DEL:                return Keyboard::BackSpace;
+        case AKEYCODE_FORWARD_DEL:        return Keyboard::Delete;
         case AKEYCODE_GRAVE:              return Keyboard::Tilde;
         case AKEYCODE_MINUS:              return Keyboard::Subtract;
         case AKEYCODE_EQUALS:             return Keyboard::Equal;