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

Merge "Update hard keyboard setup notification." into nyc-dev

Browse Source
This commit is contained in:
Yohei Yukawa
2016-03-30 15:40:55 +00:00
committed by Android (Google) Code Review
parent ca0ee285bb 2bff490292
commit 26acf08672
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/res/res/values/strings.xml
View File

@@ -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>

2
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -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());
}