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

Commit 8e5482f6 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Change 'disable hardware keyboard' to 'show input method'" into lmp-dev

parents 3f05bf4d 665366a3
Loading
Loading
Loading
Loading
+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();
+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);
+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>
+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>

+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();
Loading