Renamed cancel keyboard method

4 files changed, 7 insertions, 9 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
index e41906925..7e096c13a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
@@ -134,7 +134,7 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		};
 		doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
 
-		presentKeyboardOperation.cancelKeyboard();
+		presentKeyboardOperation.dismissKeyboard();
 
 		assertEquals(presentKeyboardOperation.isExecuting().booleanValue(), true);
 		assertEquals(presentKeyboardOperation.isFinished().booleanValue(), false);
@@ -163,7 +163,7 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		};
 		doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
 
-		presentKeyboardOperation.cancelKeyboard();
+		presentKeyboardOperation.dismissKeyboard();
 
 		assertEquals(presentKeyboardOperation.isExecuting().booleanValue(), true);
 		assertEquals(presentKeyboardOperation.isFinished().booleanValue(), false);
@@ -176,7 +176,7 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		assertEquals(presentKeyboardOperation.isExecuting().booleanValue(), false);
 		assertEquals(presentKeyboardOperation.isFinished().booleanValue(), true);
 
-		presentKeyboardOperation.cancelKeyboard();
+		presentKeyboardOperation.dismissKeyboard();
 
 		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
 
@@ -188,7 +188,7 @@ public class PresentKeyboardOperationTests extends AndroidTestCase2 {
 		assertEquals(presentKeyboardOperation.isExecuting().booleanValue(), false);
 		assertEquals(presentKeyboardOperation.isFinished().booleanValue(), false);
 
-		presentKeyboardOperation.cancelKeyboard();
+		presentKeyboardOperation.dismissKeyboard();
 
 		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
index 04b090f8c..f9c8876c4 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
@@ -543,7 +543,7 @@ abstract class BaseScreenManager extends BaseSubManager {
 	}
 
 	/**
-	 * Cancels the keyboard. If the keyboard has not yet been sent to Core, it will not be sent. If the keyboard is already presented on Core, the keyboard will be immediately dismissed. Canceling an already presented choice set will only work if connected to Core versions 6.0+. On older versions of Core, the keyboard can not be dismissed.
+	 * Cancels the keyboard-only interface if it is currently showing.
 	 */
 	public void dismissKeyboard() {
 		this.choiceSetManager.dismissKeyboard();
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
index 8e29e8d19..9432280e2 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -36,7 +36,6 @@ package com.smartdevicelink.managers.screen.choiceset;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
@@ -406,8 +405,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
 
     public void dismissKeyboard() {
         if (currentlyPresentedKeyboardOperation != null && currentlyPresentedKeyboardOperation.isExecuting()) {
-            // If the keyboard is currently presented, cancel it. Otherwise it will be ignored.
-            currentlyPresentedKeyboardOperation.cancelKeyboard();
+            currentlyPresentedKeyboardOperation.dismissKeyboard();
         }
     }
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java
index 582054a4d..159aba3ad 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java
@@ -127,7 +127,7 @@ class PresentKeyboardOperation extends AsynchronousOperation {
 
 	}
 
-	void cancelKeyboard() {
+	void dismissKeyboard() {
 		if (Thread.currentThread().isInterrupted()) {
 			return;
 		} else if (isExecuting()) {