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

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

Merge "Add keywords for a few settings" into rvc-dev

parents f420d0f3 6b73e0fc

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -1716,6 +1716,8 @@ 








    <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->









    <string name="wifi_display_settings_title">Cast</string>









    <!-- Wifi Display settings. The keywords of the setting. [CHAR LIMIT=NONE] -->









    <string name="keywords_wifi_display_settings">mirror</string>









    <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->









    <string name="wifi_display_enable_menu_item">Enable wireless display</string>









    <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->








@@ -3283,6 +3285,8 @@







    <string name="storage_menu_free">Free up space</string>









    <!-- Storage setting. Menu option for accessing the storage manager settings. [CHAR LIMIT=30] -->









    <string name="storage_menu_manage">Manage storage</string>









    <!-- Storage setting. Keywords for Free up space. [CHAR LIMIT=NONE] -->









    <string name="keywords_storage_menu_free">clean, storage</string>

















    <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->









    <string name="storage_title_usb">USB computer connection</string>








@@ -4692,6 +4696,8 @@







    <string name="keyboard_and_input_methods_category">Keyboards</string>









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









    <string name="virtual_keyboard_category">On-screen keyboard</string>









    <!-- Keywords for the 'virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->









    <string name="keywords_virtual_keyboard">Gboard</string>









    <!-- Title for the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->









    <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] -->








@@ -7748,6 +7754,9 @@







    <!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->









    <string name="vibrate_when_ringing_title">Vibrate for calls</string>

















    <!-- Sound: Keywords for Vibrate for calls. [CHAR LIMIT=NONE] -->









    <string name="keywords_vibrate_for_calls">Vibration</string>

















    <!-- Sound: Option for vibrate when ringing setting: Never vibrate. [CHAR LIMIT=40] -->









    <string name="vibrate_when_ringing_option_never_vibrate">Never vibrate</string>

































res/xml/connected_devices_advanced.xml



+2
−1






























Original line number
Diff line number
Diff line







@@ -41,7 +41,8 @@







        android:title="@string/wifi_display_settings_title"









        android:icon="@drawable/ic_cast_24dp"









        android:order="-6"









        settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"/>









        settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"









        settings:keywords="@string/keywords_wifi_display_settings"/>



















    <com.android.settingslib.RestrictedPreference









        android:fragment="com.android.settings.nfc.AndroidBeam"
































res/xml/language_and_input.xml



+2
−1






























Original line number
Diff line number
Diff line







@@ -33,7 +33,8 @@







        <Preference









            android:key="virtual_keyboard_pref"









            android:title="@string/virtual_keyboard_category"









            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />









            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment"









            settings:keywords="@string/keywords_virtual_keyboard"/>









        <Preference









            android:key="physical_keyboard_pref"









            android:title="@string/physical_keyboard_title"
































res/xml/sound_settings.xml



+2
−1






























Original line number
Diff line number
Diff line







@@ -96,7 +96,8 @@







        android:key="vibrate_for_calls"









        android:title="@string/vibrate_when_ringing_title"









        android:order="-130"









        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"/>









        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"









        settings:keywords="@string/keywords_vibrate_for_calls"/>



















    <!-- Interruptions -->









    <com.android.settingslib.RestrictedPreference
































src/com/android/settings/deviceinfo/StorageSettings.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -619,6 +619,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index







                    data.key = KEY_STORAGE_SETTINGS_FREE_SPACE;









                    data.screenTitle = context.getString(R.string.storage_menu_free);









                    data.intentAction = StorageManager.ACTION_MANAGE_STORAGE;









                    data.keywords = context.getString(R.string.keywords_storage_menu_free);









                    result.add(data);



















                    return result;