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

Commit 01038492 authored by satok's avatar satok
Browse files

Show physical keyboard control button on the input method switch dialog 

Bug: 5240095
Change-Id: Ica768083f95c33dc1e494a28ba7d8b6eb989b0ef
parent 63c115c4

core/res/res/layout/input_method_switch_dialog_title.xml

0 → 100644
+108 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical" >



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="9dip"

        android:layout_marginLeft="20dip"

        android:layout_marginRight="10dip"

        android:layout_marginTop="6dip"

        android:gravity="center_vertical"

        android:orientation="vertical" >



        <com.android.internal.widget.DialogTitle

            android:id="@+id/alertTitle"

            style="@android:style/DialogWindowTitle.Holo"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:singleLine="true"

            android:text="@string/select_input_method" />

    </LinearLayout>



    <!-- Hard keyboard switch -->



    <LinearLayout

        android:id="@+id/hard_keyboard_section"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical" >



        <View

            android:layout_width="match_parent"

            android:layout_height="2dip"

            android:background="@android:color/holo_blue_light" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal" >



            <LinearLayout

                android:layout_width="0dip"

                android:layout_height="wrap_content"

                android:layout_weight="1"

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

                android:ellipsize="marquee"

                android:gravity="center_vertical"

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

                android:orientation="vertical"

                android:paddingBottom="5dip"

                android:paddingLeft="16dip"

                android:paddingRight="0dip"

                android:paddingTop="5dip" >



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:singleLine="true"

                    android:text="@string/hardware"

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

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



                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:singleLine="true"

                    android:text="@string/use_physical_keyboard"

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

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

            </LinearLayout>



            <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="12dip" />

        </LinearLayout>

    </LinearLayout>



    <View

        android:id="@+id/titleDivider"

        android:layout_width="match_parent"

        android:layout_height="2dip"

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



</LinearLayout>
 
 No newline at end of file

core/res/res/values/public.xml

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ 
  <java-symbol type="id" name="fillInIntent" />

  <java-symbol type="id" name="find" />

  <java-symbol type="id" name="fullscreenArea" />

  <java-symbol type="id" name="hard_keyboard_section" />

  <java-symbol type="id" name="hard_keyboard_switch" />

  <java-symbol type="id" name="headers" />

  <java-symbol type="id" name="hour" />

  <java-symbol type="id" name="icon" />
@@ -1042,6 +1044,7 @@ 
  <java-symbol type="layout" name="icon_menu_layout" />

  <java-symbol type="layout" name="input_method" />

  <java-symbol type="layout" name="input_method_extract_view" />

  <java-symbol type="layout" name="input_method_switch_dialog_title" />

  <java-symbol type="layout" name="js_prompt" />

  <java-symbol type="layout" name="list_content_simple" />

  <java-symbol type="layout" name="list_menu_item_checkbox" />
@@ -1449,6 +1452,7 @@ 
  <java-symbol type="string" name="factorytest_no_action" />

  <java-symbol type="string" name="factorytest_not_system" />

  <java-symbol type="string" name="factorytest_reboot" />

  <java-symbol type="string" name="hardware" />

  <java-symbol type="string" name="heavy_weight_notification" />

  <java-symbol type="string" name="heavy_weight_notification_detail" />

  <java-symbol type="string" name="input_method_binding_label" />
@@ -1471,6 +1475,7 @@ 
  <java-symbol type="string" name="usb_cd_installer_notification_title" />

  <java-symbol type="string" name="usb_mtp_notification_title" />

  <java-symbol type="string" name="usb_notification_message" />

  <java-symbol type="string" name="use_physical_keyboard" />

  <java-symbol type="string" name="usb_ptp_notification_title" />

  <java-symbol type="string" name="vpn_text" />

  <java-symbol type="string" name="vpn_text_long" />

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2921,6 +2921,10 @@ 
    <string name="select_input_method">Choose input method</string>

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

    <string name="configure_input_methods">Set up input methods</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>

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

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



    <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>

    <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>

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

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:paddingBottom="28dip"

    android:paddingBottom="7dip"

    android:orientation="vertical"

    android:visibility="gone">

    <View
@@ -38,7 +38,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginLeft="20dip"

            android:orientation="vertical"

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

            android:background="@drawable/notify_panel_clock_bg">

            <!-- Hard keyboard switch -->

            <LinearLayout

                android:id="@+id/hard_keyboard_section"
@@ -51,7 +51,7 @@ 
                    android:orientation="horizontal">

                    <TextView

                        android:id="@+id/use_physical_keyboard_label"

                        android:layout_width="wrap_content"

                        android:layout_width="0dip"

                        android:layout_height="wrap_content"

                        android:layout_weight="1"

                        android:minHeight="?android:attr/listPreferredItemHeight"
@@ -82,7 +82,7 @@ 
            <!-- Input method list -->

            <ScrollView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="0dip"

                android:overScrollMode="ifContentScrolls"

                android:layout_marginTop="3dip"

                android:layout_weight="1"

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 
    <string name="status_bar_input_method_settings_configure_input_methods">Set up 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>

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



    <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->

    <string name="usb_device_permission_prompt">Allow the app <xliff:g id="application">%1$s</xliff:g> to access the USB device?</string>