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

Commit 665366a3 authored by Michael Wright's avatar Michael Wright
Browse files

Change 'disable hardware keyboard' to 'show input method' 

Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.

Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
parent 80432256

core/java/com/android/internal/statusbar/IStatusBar.aidl

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ oneway interface IStatusBar 
    void topAppWindowChanged(boolean menuVisible);

    void setImeWindowStatus(in IBinder token, int vis, int backDisposition,

            boolean showImeSwitcher);

    void setHardKeyboardStatus(boolean available, boolean enabled);

    void setWindowState(int window, int state);

    void buzzBeepBlinked();

    void notificationLightOff();

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ interface IStatusBarService 
            in String[] newlyVisibleKeys, in String[] noLongerVisibleKeys);

    void onNotificationExpansionChanged(in String key, in boolean userAction, in boolean expanded);

    void setSystemUiVisibility(int vis, int mask);

    void setHardKeyboardEnabled(boolean enabled);

    void setWindowState(int window, int state);



    void showRecentApps(boolean triggeredFromAltTab);

core/res/res/layout/input_method_switch_dialog_title.xml

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:singleLine="true"

                    android:text="@string/use_physical_keyboard"

                    android:text="@string/show_ime"

                    android:textAppearance="?android:attr/textAppearanceSmall"

                    android:textColor="?android:attr/textColorAlertDialogListItem" />

            </LinearLayout>

core/res/res/values/strings.xml

+3 −2
Original line number Diff line number Diff line
@@ -3783,8 +3783,9 @@ 
    <string name="select_input_method">Change keyboard</string>

    <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->

    <string name="configure_input_methods">Choose keyboards</string>

    <!-- Summary text of a toggle switch to enable/disable use of the physical keyboard in the input method selector [CHAR LIMIT=25] -->

    <string name="use_physical_keyboard">Physical keyboard</string>

    <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical

         keyboard is connected[CHAR LIMIT=25] -->

    <string name="show_ime">Show input method</string>

    <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->

    <string name="hardware">Hardware</string>

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+1 −2
Original line number Diff line number Diff line
@@ -457,8 +457,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
        setSystemUiVisibility(switches[1], 0xffffffff);

        topAppWindowChanged(switches[2] != 0);

        // StatusBarManagerService has a back up of IME token and it's restored here.

        setImeWindowStatus(binders.get(0), switches[3], switches[4], switches[7] != 0);

        setHardKeyboardStatus(switches[5] != 0, switches[6] != 0);

        setImeWindowStatus(binders.get(0), switches[3], switches[4], switches[5] != 0);



        // Set up the initial icon state

        int N = iconList.size();