diff options
| author | 2016-03-30 15:40:55 +0000 | |
|---|---|---|
| committer | 2016-03-30 15:40:57 +0000 | |
| commit | 26acf08672305cd162a81c0afa4d7cd8c44d1cdb (patch) | |
| tree | f38bbb4d58eecb87334ab4815bd36bedf12e6055 | |
| parent | ca0ee285bb28ee5698d7cf2680e2fa6ca337cefd (diff) | |
| parent | 2bff4902929037cc7135a0769c43721a1322cb98 (diff) | |
Merge "Update hard keyboard setup notification." into nyc-dev
| -rw-r--r-- | core/res/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/input/InputManagerService.java | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 6041f637c89d..b878b00a6b50 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2953,10 +2953,11 @@ <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=30] --> <string name="hardware">Show virtual keyboard</string> - <!-- Title of the notification to prompt the user to select a keyboard layout. --> - <string name="select_keyboard_layout_notification_title">Select keyboard layout</string> - <!-- Message of the notification to prompt the user to select a keyboard layout. --> - <string name="select_keyboard_layout_notification_message">Touch to select a keyboard layout.</string> + <!-- Title of the notification to prompt the user to configure physical keyboard settings. --> + <string name="select_keyboard_layout_notification_title">Configure physical keyboard</string> + <!-- Message of the notification to prompt the user to configure physical keyboard settings + where the user can associate language with physical keyboard layout. --> + <string name="select_keyboard_layout_notification_message">Tap to select language and layout</string> <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 3c04b7820549..e73beaab6f0b 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -948,7 +948,7 @@ public class InputManagerService extends IInputManager.Stub // Must be called on handler. private void showMissingKeyboardLayoutNotification(InputDevice device) { if (!mKeyboardLayoutNotificationShown) { - final Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS); + final Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS); if (device != null) { intent.putExtra(Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, device.getIdentifier()); } |