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

Commit beee3044 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Implement new keyboard settings UI."

parents d115638c 1639782d

res/drawable/ic_check_24dp.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!-- Copyright (C) 2022 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.

-->

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

        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?androidprv:attr/colorAccentPrimaryVariant">

    <path

        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"

        android:fillColor="@android:color/white"/>

</vector>
 
 No newline at end of file

res/layout/keyboard_layout_picker.xml

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

<!-- Copyright (C) 2022 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:id="@+id/keyboard_layout_picker_container"

    android:orientation="vertical">



    <FrameLayout

        android:id="@+id/keyboard_layout_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="1dp"

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

        android:outlineAmbientShadowColor="@android:color/transparent"

        android:outlineSpotShadowColor="@android:color/transparent"/>



    <FrameLayout

        android:id="@+id/keyboard_layouts"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/colorBackground"/>



</LinearLayout>
 
 No newline at end of file

res/layout/preference_check_icon.xml

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

<!-- Copyright (C) 2022 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.

-->

<ImageView

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

    android:id="@+id/keyboard_check_icon"

    android:src="@drawable/ic_check_24dp"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_centerVertical="true"

    android:layout_marginHorizontal="16dp"/>
 
 No newline at end of file

res/values/strings.xml

+10 −3
Original line number Diff line number Diff line
@@ -1312,6 +1312,8 @@ 








    <!-- Title of device details screen [CHAR LIMIT=28]-->









    <string name="device_details_title">Device details</string>









    <!-- Title for keyboard settings preferences. [CHAR LIMIT=50] -->









    <string name="bluetooth_device_keyboard_settings_preference_title">Keyboard settings</string>









    <!-- Title of the item to show device MAC address -->









    <string name="bluetooth_device_mac_address">Device\'s Bluetooth address: <xliff:g id="address">%1$s</xliff:g></string>









    <!-- Title of the items to show multuple devices MAC address [CHAR LIMIT=NONE]-->








@@ -3641,8 +3643,8 @@







    <string name="available_virtual_keyboard_category">Available On-screen keyboard</string>









    <!-- Title for the button to trigger the 'Manage keyboards' preference sub-screen, where the user can turn on/off installed virtual keyboards.[CHAR LIMIT=35] -->









    <string name="add_virtual_keyboard">Manage on-screen keyboards</string>









    <!-- Title for the 'keyboard assistance' preference category. [CHAR LIMIT=35] -->









    <string name="keyboard_assistance_category">Keyboard assistance</string>









    <!-- Title for the 'keyboard options' preference category. [CHAR LIMIT=35] -->









    <string name="keyboard_options_category">Options</string>









    <!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] -->









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









    <!-- Title for the 'show virtual keyboard' preference switch. [CHAR LIMIT=35] -->








@@ -3652,7 +3654,7 @@







    <!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->









    <string name="keyboard_shortcuts_helper">Keyboard shortcuts</string>









    <!-- Summary text for the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=100] -->









    <string name="keyboard_shortcuts_helper_summary">Display available shortcuts</string>









    <string name="keyboard_shortcuts_helper_summary">Show list of shortcuts</string>









    <!-- Title for the 'Work profile keyboards & tools' preference category inside Languages and inputs'. [CHAR LIMIT=50] -->









    <string name="language_and_input_for_work_category_title">Work profile keyboards &amp; tools</string>









    <!-- Title for the 'Virtual keyboards for work' preference. [CHAR LIMIT=45] -->








@@ -3687,6 +3689,8 @@







    <!-- Keyboard Layout Picker --> <skip />









    <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->









    <string name="keyboard_layout_picker_title">Keyboard layouts</string>









    <!-- Category title for the keyboard layout picker activity. [CHAR LIMIT=35] -->









    <string name="keyboard_layout_picker_category_title">Physical keyboard layouts</string>

















    <!-- User dictionary settings --><skip />









    <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->








@@ -3742,6 +3746,9 @@







    <!-- Title for built-in keyboard settings -->









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

















    <!-- Title for enabled locales keyboard layout page -->









    <string name="enabled_locales_keyboard_layout">Layout</string>

















    <!-- Title for the screen that lets the user choose a gadget to add to the home screen









         (or other screens that can host gadgets).  Note to translators: we're still determining









         the final name for Gadgets/Widgets, so please translate both for now. -->
































res/xml/bluetooth_device_details_fragment.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -88,6 +88,12 @@







            settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>









    </PreferenceCategory>



















    <Preference









        android:key="keyboard_settings"









        android:persistent="false"









        android:title="@string/bluetooth_device_keyboard_settings_preference_title"









        settings:controller="com.android.settings.inputmethod.KeyboardSettingsPreferenceController"/>



















    <com.android.settingslib.widget.FooterPreference









        android:key="device_details_footer"









        android:selectable="false"