Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143" into nyc-dev

Browse Source 
am: 2e36a9e1c7

* commit '2e36a9e1c726310c51005b1b970ac9394006bdbd':
  Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143
This commit is contained in:
Anna Galusza
2016-03-01 23:57:15 +00:00
committed by android-build-merger
parent cef5ba5adc 2e36a9e1c7
commit e853ceb080
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/java/android/accessibilityservice/AccessibilityService.java
View File

@@ -383,13 +383,7 @@ public abstract class AccessibilityService extends Service {
@Retention(RetentionPolicy.SOURCE)
@IntDef({SHOW_MODE_AUTO, SHOW_MODE_HIDDEN})
public @interface SoftKeyboardShowMode {};
/**
* @hide
*/
public static final int SHOW_MODE_AUTO = 0;
/**
* @hide
*/
public static final int SHOW_MODE_HIDDEN = 1;
private int mConnectionId;
@@ -1137,7 +1131,7 @@ public abstract class AccessibilityService extends Service {
}
/**
* Removes all instances of the specified change listener from teh list of magnification
* Removes all instances of the specified change listener from the list of magnification
* change listeners.
*
* @param listener the listener to remove, must be non-null
@@ -1216,14 +1210,11 @@ public abstract class AccessibilityService extends Service {
/**
* Returns the show mode of the soft keyboard. The default show mode is
* {@code Settings.Secure.SHOW_MODE_AUTO}, where the soft keyboard is shown when a text
* input field is focused. An AccessibilityService can also request the show mode
* {@code Settings.Secure.SHOW_MODE_HIDDEN}, where the soft keyboard is never shown.
* {@code SHOW_MODE_AUTO}, where the soft keyboard is shown when a text input field is
* focused. An AccessibilityService can also request the show mode
* {@code SHOW_MODE_HIDDEN}, where the soft keyboard is never shown.
*
* @return the current soft keyboard show mode
*
* @see Settings#Secure#SHOW_MODE_AUTO
* @see Settings#Secure#SHOW_MODE_HIDDEN
*/
@SoftKeyboardShowMode
public int getShowMode() {
@@ -1239,9 +1230,9 @@ public abstract class AccessibilityService extends Service {
/**
* Sets the soft keyboard show mode. The default show mode is
* {@code Settings.Secure.SHOW_MODE_AUTO}, where the soft keyboard is shown when a text
* input field is focused. An AccessibilityService can also request the show mode
* {@code Settings.Secure.SHOW_MODE_HIDDEN}, where the soft keyboard is never shown. The
* {@code SHOW_MODE_AUTO}, where the soft keyboard is shown when a text input field is
* focused. An AccessibilityService can also request the show mode
* {@code SHOW_MODE_HIDDEN}, where the soft keyboard is never shown. The
* The lastto this method will be honored, regardless of any previous calls (including those
* made by other AccessibilityServices).
* <p>
@@ -1251,9 +1242,6 @@ public abstract class AccessibilityService extends Service {
*
* @param showMode the new show mode for the soft keyboard
* @return {@code true} on success
*
* @see Settings#Secure#SHOW_MODE_AUTO
* @see Settings#Secure#SHOW_MODE_HIDDEN
*/
public boolean setShowMode(@SoftKeyboardShowMode int showMode) {
final IAccessibilityServiceConnection connection =
@@ -1263,9 +1251,13 @@ public abstract class AccessibilityService extends Service {
try {
return connection.setSoftKeyboardShowMode(showMode);
} catch (RemoteException re) {
Log.w(LOG_TAG, "Falied to set soft keyboard behavior", re);
Log.w(LOG_TAG, "Failed to set soft keyboard behavior", re);
re.rethrowFromSystemServer();
}
} else {
throw new RuntimeException("AccessibilityServiceConnection is null");
}
return false;
}
@@ -1275,9 +1267,9 @@ public abstract class AccessibilityService extends Service {
public interface OnShowModeChangedListener {
/**
* Called when the soft keyboard behavior changes. The default show mode is
* {@code Settings.Secure.SHOW_MODE_AUTO}, where the soft keyboard is shown when a text
* input field is focused. An AccessibilityService can also request the show mode
* {@code Settings.Secure.SHOW_MODE_HIDDEN}, where the soft keyboard is never shown.
* {@code SHOW_MODE_AUTO}, where the soft keyboard is shown when a text input field is
* focused. An AccessibilityService can also request the show mode
* {@code SHOW_MODE_HIDDEN}, where the soft keyboard is never shown.
*
* @param controller the soft keyboard controller
* @param showMode the current soft keyboard show mode