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

Commit 3c89f6d1 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb

parents e97a12e3 2992ea78

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

+1 −0
Original line number Diff line number Diff line
@@ -33,5 +33,6 @@ oneway interface IStatusBar 
    void setLightsOn(boolean on);

    void setMenuKeyVisible(boolean visible);

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

    void setHardKeyboardStatus(boolean available, boolean enabled);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ interface IStatusBarService 
    void onClearAllNotifications();

    void onNotificationClear(String pkg, String tag, int id);

    void setSystemUiVisibility(int vis);

    void setHardKeyboardEnabled(boolean enabled);

}

packages/SystemUI/res/layout-xlarge/status_bar_input_methods_panel.xml

+43 −0
Original line number Diff line number Diff line
@@ -38,6 +38,47 @@ 
            android:layout_marginLeft="20dip"

            android:orientation="vertical"

            android:background="@*android:drawable/dialog_full_holo_dark">

            <!-- Hard keyboard switch -->

            <LinearLayout

                android:id="@+id/hard_keyboard_section"

                android:layout_height="wrap_content"

                android:layout_width="match_parent"

                android:orientation="vertical">

                <LinearLayout

                    android:layout_height="wrap_content"

                    android:layout_width="match_parent"

                    android:orientation="horizontal">

                    <TextView

                        android:id="@+id/use_physical_keyboard_label"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_weight="1"

                        android:minHeight="?android:attr/listPreferredItemHeight"

                        android:background="?android:attr/selectableItemBackground"

                        android:orientation="vertical"

                        android:paddingRight="6dip"

                        android:paddingLeft="30dip"

                        android:paddingTop="5dip"

                        android:paddingBottom="5dip"

                        android:gravity="center_vertical"

                        android:singleLine="true"

                        android:text="@string/status_bar_use_physical_keyboard"

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

                        android:ellipsize="marquee" />

                    <Switch

                        android:id="@+id/hard_keyboard_switch"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_vertical"

                        android:layout_marginRight="16dip" />

                </LinearLayout>

                <View

                    android:layout_width="match_parent"

                    android:layout_height="1dip"

                    android:background="@android:drawable/divider_horizontal_dark" />

            </LinearLayout>



            <!-- Input method list -->

            <ScrollView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"
@@ -50,6 +91,8 @@ 
                    android:layout_height="wrap_content"

                    android:orientation="vertical" />

            </ScrollView>



            <!-- Configure input methods -->

            <TextView

                android:id="@+id/ime_settings_shortcut"

                android:layout_width="match_parent"

packages/SystemUI/res/values-es-rUS/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -43,4 +43,5 @@ 
    <!-- outdated translation 5550538721034982973 -->     <string name="recent_tasks_app_label" msgid="3796483981246752469">"Google Apps"</string>

    <!-- outdated translation 8017158699581472359 -->     <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth anclado"</string>

    <!-- outdated translation 3875357213648023768 -->     <string name="status_bar_input_method_settings_configure_input_methods" msgid="737483394044014246">"Configurar métodos de entrada"</string>

    <string name="status_bar_use_physical_keyboard">"Usar un teclado externo"</string>

</resources>

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -112,4 +112,7 @@ 
    <string name="bluetooth_tethered">Bluetooth tethered</string>

    <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->

    <string name="status_bar_input_method_settings_configure_input_methods">Configure input methods</string>



    <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->

    <string name="status_bar_use_physical_keyboard">Use physical keyboard</string>

</resources>