diff --git a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index 083e420f..1f56c147 100644
Binary files a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ
diff --git a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index 7b19439f..fe15aabf 100644
Binary files a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
index 81b34fa0..96181bfe 100644
Binary files a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ
diff --git a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index 68c327f3..d4c283e1 100644
Binary files a/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml b/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml
index 8f712fe7..c60d22d6 100644
--- a/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml
+++ b/src/java/KP2ASoftkeyboard_AS/.idea/misc.xml
@@ -3,6 +3,30 @@
+
+
+
+
+
+
diff --git a/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml b/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
index eee10623..dfc76476 100644
--- a/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
+++ b/src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
@@ -32,7 +32,104 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1320,7 +1367,7 @@
-
+
@@ -1348,7 +1395,6 @@
-
@@ -1372,11 +1418,15 @@
+
+
+
+
@@ -1384,6 +1434,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1418,6 +1535,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1456,6 +1618,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1483,35 +1673,35 @@
-
-
+
+
-
-
-
+
+
+
+
-
+
-
+
-
+
-
@@ -1611,13 +1801,6 @@
-
-
-
-
-
-
-
@@ -1625,5 +1808,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml b/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml
index 279898fc..bb266a70 100644
--- a/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml
+++ b/src/java/KP2ASoftkeyboard_AS/KP2ASoftkeyboard_AS.iml
@@ -8,7 +8,7 @@
-
+
diff --git a/src/java/KP2ASoftkeyboard_AS/app/app.iml b/src/java/KP2ASoftkeyboard_AS/app/app.iml
index 6644dd61..3bbb5cd2 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/app.iml
+++ b/src/java/KP2ASoftkeyboard_AS/app/app.iml
@@ -12,8 +12,9 @@
-
-
+
+ generateDebugSources
+
@@ -23,9 +24,9 @@
-
+
-
+
@@ -47,6 +48,13 @@
+
+
+
+
+
+
+
@@ -61,23 +69,23 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
@@ -85,5 +93,6 @@
+
\ No newline at end of file
diff --git a/src/java/KP2ASoftkeyboard_AS/app/build.gradle b/src/java/KP2ASoftkeyboard_AS/app/build.gradle
index c8f5f4de..e6718595 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/build.gradle
+++ b/src/java/KP2ASoftkeyboard_AS/app/build.gradle
@@ -1,8 +1,7 @@
apply plugin: 'com.android.library'
-
android {
compileSdkVersion 23
- buildToolsVersion "23.0.0"
+ buildToolsVersion '23.0.2'
defaultConfig {
minSdkVersion 18
@@ -16,3 +15,6 @@ android {
}
}
}
+
+dependencies {
+}
\ No newline at end of file
diff --git a/src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar b/src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar
index 4424afd0..432b3ed1 100644
Binary files a/src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar and b/src/java/KP2ASoftkeyboard_AS/app/build/outputs/aar/app-debug.aar differ
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java b/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java
index ae1781e7..af0f8ac8 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/autofill/AutoFillService.java
@@ -1,6 +1,7 @@
package keepass2android.autofill;
import android.accessibilityservice.AccessibilityService;
+import android.annotation.TargetApi;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -68,6 +69,7 @@ public class AutoFillService extends AccessibilityService {
}
}
+ @TargetApi(21)
class SystemUiCondition implements NodeCondition
{
@Override
@@ -108,6 +110,18 @@ public class AutoFillService extends AccessibilityService {
public void onAccessibilityEvent(AccessibilityEvent event) {
android.util.Log.d(_logTag, "OnAccEvent");
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+ {
+ android.util.Log.d(_logTag, "AndroidVersion not supported");
+ return;
+ }
+
+ handleAccessibilityEvent(event);
+
+ }
+
+ @TargetApi(21)
+ private void handleAccessibilityEvent(AccessibilityEvent event) {
try
{
if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED
@@ -219,9 +233,9 @@ public class AutoFillService extends AccessibilityService {
NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
notificationManager.notify(autoFillNotificationId+1, builder.build());*/
}
-
}
+ @TargetApi(21)
private void AskFillPassword(String url)
{
@@ -273,6 +287,7 @@ public class AutoFillService extends AccessibilityService {
}
+ @TargetApi(21)
private void FillPassword(String url, AccessibilityNodeInfo usernameEdit, List passwordFields)
{
if ((keepass2android.kbbridge.KeyboardData.hasData()) && (_hasUsedData == false))
@@ -290,6 +305,7 @@ public class AutoFillService extends AccessibilityService {
//LookupCredentialsActivity.LastReceivedCredentials = null;
}
+ @TargetApi(21)
private void fillDataInTextField(AccessibilityNodeInfo edit, String value) {
if ((value == null) || (edit == null))
return;
diff --git a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/xml/accserviceconfig.xml b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/xml/accserviceconfig.xml
index a3e8fd10..8110bac5 100644
--- a/src/java/KP2ASoftkeyboard_AS/app/src/main/res/xml/accserviceconfig.xml
+++ b/src/java/KP2ASoftkeyboard_AS/app/src/main/res/xml/accserviceconfig.xml
@@ -3,7 +3,7 @@
android:description="@string/AutoFillServiceDescription"
android:accessibilityEventTypes="typeAllMask"
android:accessibilityFlags="flagDefault"
- android:accessibilityFeedbackType="feedbackSpoken"
+ android:accessibilityFeedbackType="feedbackGeneric"
android:notificationTimeout="100"
android:canRetrieveWindowContent="true"