diff options
author | Michael Wright <michaelwr@google.com> | 2014-09-25 22:27:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 22:27:05 +0000 |
commit | e27380ac46fe7beab8bf0f6409efab0482e2cee0 (patch) | |
tree | 01a42595ae509b48b2c5dab0be195630e87a4d82 /core/java/android/provider | |
parent | 845ea54c510827fbe95ad61fafdb16df93272065 (diff) | |
parent | 42dad8041823833106311ff43cc17a8b3c583d32 (diff) | |
download | frameworks_base-e27380ac46fe7beab8bf0f6409efab0482e2cee0.zip frameworks_base-e27380ac46fe7beab8bf0f6409efab0482e2cee0.tar.gz frameworks_base-e27380ac46fe7beab8bf0f6409efab0482e2cee0.tar.bz2 |
am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
Specify a device identifier for keyboard layout notification.
Diffstat (limited to 'core/java/android/provider')
-rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 440b1ec..ec4a53e 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -978,6 +978,19 @@ public final class Settings { public static final String EXTRA_INPUT_METHOD_ID = "input_method_id"; /** + * Activity Extra: The device identifier to act upon. + * <p> + * This can be passed as an extra field in an Activity Intent with a single + * InputDeviceIdentifier. This field is used by some activities to jump straight into the + * settings for the given device. + * <p> + * Example: The {@link #INPUT_METHOD_SETTINGS} intent opens the keyboard layout dialog for the + * given device. + * @hide + */ + public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier"; + + /** * @hide * Activity Extra: Enable or disable Airplane Mode. * <p> |