summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorPhil Weaver <pweaver@google.com>2018-09-08 23:20:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-09-08 23:20:32 +0000
commitec2b49927e1722841182838d447ff5c70a4bd593 (patch)
tree3427e67084052a086c187ee0b575f825cf7a2377 /core/java/android
parent1b104c1f49be676d33050420bfa02366caa734f0 (diff)
parente05fba4e94acbf601adf3635bdce08b145d8e0c7 (diff)
Merge "Change API name for a11y keyboard flag"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/accessibilityservice/AccessibilityService.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java
index 5b73eaa9cd17..446e6cc0769c 100644
--- a/core/java/android/accessibilityservice/AccessibilityService.java
+++ b/core/java/android/accessibilityservice/AccessibilityService.java
@@ -399,7 +399,7 @@ public abstract class AccessibilityService extends Service {
@IntDef(prefix = { "SHOW_MODE_" }, value = {
SHOW_MODE_AUTO,
SHOW_MODE_HIDDEN,
- SHOW_MODE_WITH_HARD_KEYBOARD
+ SHOW_MODE_IGNORE_HARD_KEYBOARD
})
public @interface SoftKeyboardShowMode {}
@@ -419,7 +419,7 @@ public abstract class AccessibilityService extends Service {
* Allow the soft keyboard to be shown, even if a hard keyboard is connected
* @see SoftKeyboardController
*/
- public static final int SHOW_MODE_WITH_HARD_KEYBOARD = 2;
+ public static final int SHOW_MODE_IGNORE_HARD_KEYBOARD = 2;
/**
* Mask used to cover the show modes supported in public API
@@ -1205,7 +1205,7 @@ public abstract class AccessibilityService extends Service {
*
* @see AccessibilityService#SHOW_MODE_AUTO
* @see AccessibilityService#SHOW_MODE_HIDDEN
- * @see AccessibilityService#SHOW_MODE_WITH_HARD_KEYBOARD
+ * @see AccessibilityService#SHOW_MODE_IGNORE_HARD_KEYBOARD
*/
public static final class SoftKeyboardController {
private final AccessibilityService mService;
@@ -1354,7 +1354,7 @@ public abstract class AccessibilityService extends Service {
*
* @see AccessibilityService#SHOW_MODE_AUTO
* @see AccessibilityService#SHOW_MODE_HIDDEN
- * @see AccessibilityService#SHOW_MODE_WITH_HARD_KEYBOARD
+ * @see AccessibilityService#SHOW_MODE_IGNORE_HARD_KEYBOARD
*/
@SoftKeyboardShowMode
public int getShowMode() {
@@ -1384,7 +1384,7 @@ public abstract class AccessibilityService extends Service {
*
* @see AccessibilityService#SHOW_MODE_AUTO
* @see AccessibilityService#SHOW_MODE_HIDDEN
- * @see AccessibilityService#SHOW_MODE_WITH_HARD_KEYBOARD
+ * @see AccessibilityService#SHOW_MODE_IGNORE_HARD_KEYBOARD
*/
public boolean setShowMode(@SoftKeyboardShowMode int showMode) {
final IAccessibilityServiceConnection connection =