From b4e742b00ff3fb6cdd6d21914558b3d61d72fef1 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Wed, 8 Mar 2017 16:38:02 +0200
Subject: [PATCH 1/2] Android keyboard fixes

---
 apps/app/ui-tests-app/issues/issue-2942.ts  | 15 ++++++++++++---
 apps/app/ui-tests-app/issues/issue-2942.xml |  3 ++-
 tns-core-modules/utils/utils.android.ts     | 17 +++++++++++++----
 tns-core-modules/utils/utils.d.ts           |  2 +-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/apps/app/ui-tests-app/issues/issue-2942.ts b/apps/app/ui-tests-app/issues/issue-2942.ts
index e4394d4bd..74adc2d86 100644
--- a/apps/app/ui-tests-app/issues/issue-2942.ts
+++ b/apps/app/ui-tests-app/issues/issue-2942.ts
@@ -1,11 +1,20 @@
-export function onButtonLoaded(args){
-    if (args.object.android){
+import { ad } from "utils//utils";
+import { isAndroid } from "platform";
+
+export function onButtonLoaded(args) {
+    if (args.object.android) {
         args.object.android.setFocusableInTouchMode(true);
         args.object.android.setFocusable(true);
         args.object.android.setClickable(true);
     }
 }
 
-export function onListViewLoaded(args){
+export function onListViewLoaded(args) {
     args.object.items = [1];
+}
+
+export function hideKeyboard() {
+    if (isAndroid) {
+        ad.dismissSoftInput();
+    }
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/issues/issue-2942.xml b/apps/app/ui-tests-app/issues/issue-2942.xml
index e5d1f256e..5ea328e18 100644
--- a/apps/app/ui-tests-app/issues/issue-2942.xml
+++ b/apps/app/ui-tests-app/issues/issue-2942.xml
@@ -1,6 +1,7 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd">
 <StackLayout>
-  <Button height="100" width="100" loaded="onButtonLoaded" text="Click me 3rd (Android)" style.fontSize="8"/>
+  <Button height="50" width="100" text="hide keyboard" onTap="hideKeyboard" style.fontSize="8"/>
+  <Button height="50" width="100" loaded="onButtonLoaded" text="Click me 3rd (Android)" style.fontSize="8"/>
   <ListView loaded="onListViewLoaded">
       <ListView.itemTemplate>
         <StackLayout>
diff --git a/tns-core-modules/utils/utils.android.ts b/tns-core-modules/utils/utils.android.ts
index 5852e0f87..5a3f0b229 100644
--- a/tns-core-modules/utils/utils.android.ts
+++ b/tns-core-modules/utils/utils.android.ts
@@ -4,7 +4,7 @@
 
 export * from "./utils-common";
 
-import { getNativeApplication } from "application";
+import { getNativeApplication, android as androidApp } from "application";
 
 export module layout {
     let density: number;
@@ -98,10 +98,19 @@ export module ad {
         }
     }
 
-    export function dismissSoftInput(nativeView: android.view.View): void {
+    export function dismissSoftInput(nativeView?: android.view.View): void {
         const inputManager = getInputMethodManager();
-        if (inputManager && nativeView instanceof android.view.View && inputManager.isActive(nativeView)) {
-            inputManager.hideSoftInputFromWindow(nativeView.getWindowToken(), 0);
+        let windowToken: android.os.IIBinder;
+
+        if (nativeView instanceof android.view.View) {
+            windowToken = nativeView.getWindowToken()
+        } else if (androidApp.foregroundActivity instanceof android.app.Activity) {
+            const currentFocus = androidApp.foregroundActivity.getCurrentFocus();
+            windowToken = currentFocus ? currentFocus.getWindowToken() : null;
+        }
+
+        if (inputManager && windowToken) {
+            inputManager.hideSoftInputFromWindow(windowToken, 0);
         }
     }
 
diff --git a/tns-core-modules/utils/utils.d.ts b/tns-core-modules/utils/utils.d.ts
index 13e0af21c..53cd91980 100644
--- a/tns-core-modules/utils/utils.d.ts
+++ b/tns-core-modules/utils/utils.d.ts
@@ -94,7 +94,7 @@ export module ad {
     /**
      * Hides the soft input method, ususally a soft keyboard.
      */
-    export function dismissSoftInput(nativeView: any /* android.view.View */): void;
+    export function dismissSoftInput(nativeView?: any /* android.view.View */): void;
 
     /**
      * Shows the soft input method, ususally a soft keyboard.

From b6b25d01aed965540085c4a608bfd41044559202 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Thu, 9 Mar 2017 14:49:02 +0200
Subject: [PATCH 2/2] Use getDecorView() to lose focus

---
 tns-core-modules/utils/utils.android.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tns-core-modules/utils/utils.android.ts b/tns-core-modules/utils/utils.android.ts
index 5a3f0b229..7ad6515ed 100644
--- a/tns-core-modules/utils/utils.android.ts
+++ b/tns-core-modules/utils/utils.android.ts
@@ -105,8 +105,8 @@ export module ad {
         if (nativeView instanceof android.view.View) {
             windowToken = nativeView.getWindowToken()
         } else if (androidApp.foregroundActivity instanceof android.app.Activity) {
-            const currentFocus = androidApp.foregroundActivity.getCurrentFocus();
-            windowToken = currentFocus ? currentFocus.getWindowToken() : null;
+            const decorView = androidApp.foregroundActivity.getWindow().getDecorView();
+            windowToken = decorView ? decorView.getWindowToken() : null;
         }
 
         if (inputManager && windowToken) {