summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatok <satok@google.com>2013-09-02 05:49:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-02 05:49:43 +0000
commitf272446372b865e315240bce50853769d77fa939 (patch)
tree1368eb3eafe5b531536679673a6f1eb9e4eaa1ec
parent52c10e94d98e32d977bfd4021136f4c9fa571bd6 (diff)
parent15ab6b016c0cabda502c97d248b45f5c617f0428 (diff)
downloadframeworks_base-f272446372b865e315240bce50853769d77fa939.zip
frameworks_base-f272446372b865e315240bce50853769d77fa939.tar.gz
frameworks_base-f272446372b865e315240bce50853769d77fa939.tar.bz2
Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev
-rw-r--r--core/java/android/view/inputmethod/InputMethodManager.java10
-rw-r--r--core/res/res/values/attrs.xml8
2 files changed, 14 insertions, 4 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index f97e3dd..54b87de 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -1876,9 +1876,13 @@ public final class InputMethodManager {
}
/**
- * Returns true if the current IME needs to offer the users a way to switch to a next input
- * method. When the user triggers it, the IME has to call {@link #switchToNextInputMethod} to
- * switch to a next input method which is selected by the system.
+ * Returns true if the current IME needs to offer the users ways to switch to a next input
+ * method (e.g. a globe key.).
+ * When an IME sets supportsSwitchingToNextInputMethod and this method returns true,
+ * the IME has to offer ways to to invoke {@link #switchToNextInputMethod} accordingly.
+ * <p> Note that the system determines the most appropriate next input method
+ * and subtype in order to provide the consistent user experience in switching
+ * between IMEs and subtypes.
* @param imeToken Supplies the identifying token given to an input method when it was started,
* which allows it to perform this operation on itself.
*/
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 5444cb1..f8cffa7 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2379,7 +2379,13 @@
method should be considered an option as the default. -->
<attr name="isDefault" format="boolean" />
<!-- Set to true if this input method supports ways to switch to
- a next input method (e.g. a globe key.). -->
+ a next input method (e.g. a globe key.). When this is true and
+ InputMethodManager#shouldOfferSwitchingToNextInputMethod() returns true,
+ the IME has to offer ways to to invoke InputMethodManager#switchToNextInputMethod()
+ accordingly.
+ <p> Note that the system determines the most appropriate next input method
+ and subtype in order to provide the consistent user experience in switching
+ between IMEs and subtypes. -->
<attr name="supportsSwitchingToNextInputMethod" format="boolean" />
</declare-styleable>