Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d2125fa authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Update hard keyboard setup notification." into nyc-dev am: 26acf086 

am: 5426a3db

* commit '5426a3db':
  Update hard keyboard setup notification.

Change-Id: Iaeca00f9914d0afdd5cd89268ef05ec51d2182cc
parents 4f1f7b01 5426a3db

core/res/res/values/strings.xml

+5 −4
Original line number Diff line number Diff line
@@ -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>

services/core/java/com/android/server/input/InputManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

            }