Merge "Revert "Settings search - Navigate user to exact page""
This commit is contained in:
committed by
Android (Google) Code Review
commit
244afa02d2
@@ -17,7 +17,8 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="magnification_preference_screen_title"
|
||||
android:title="@string/accessibility_screen_magnification_title">
|
||||
android:title="@string/accessibility_screen_magnification_title"
|
||||
settings:searchable="false">
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
|
||||
android:key="screen_magnification_gestures_preference_screen"
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="accessibility_notification_vibration_screen"
|
||||
android:title="@string/accessibility_notification_vibration_title" />
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="accessibility_ring_vibration_screen"
|
||||
android:title="@string/accessibility_ring_vibration_title" />
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="accessibility_shortcut_service_screen"
|
||||
android:title="@string/accessibility_shortcut_service_title" />
|
||||
|
@@ -15,7 +15,6 @@
|
||||
-->
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="accessibility_shortcut_settings_screen"
|
||||
android:title="@string/accessibility_global_gesture_preference_title" >
|
||||
|
||||
<Preference
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="accessibility_touch_vibration_screen"
|
||||
android:title="@string/accessibility_touch_vibration_title" />
|
||||
|
@@ -79,7 +79,6 @@
|
||||
android:key="app_and_notif_cell_broadcast_settings"
|
||||
android:title="@string/cell_broadcast_settings"
|
||||
android:order="15"
|
||||
settings:searchable="false"
|
||||
settings:useAdminDisabledSummary="true">
|
||||
<intent
|
||||
android:action="android.intent.action.MAIN"
|
||||
|
@@ -16,7 +16,6 @@
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="automatic_storage_manager_screen"
|
||||
android:title="@string/automatic_storage_manager_settings" >
|
||||
|
||||
<DropDownPreference
|
||||
|
@@ -18,7 +18,6 @@
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="battery_saver_schedule_screen"
|
||||
android:title="@string/battery_saver_schedule_settings_title"
|
||||
settings:staticPreferenceLocation="append">
|
||||
</PreferenceScreen >
|
||||
|
@@ -17,7 +17,6 @@
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="bluetooth_pairing_detail_screen"
|
||||
android:title="@string/bluetooth_pairing_pref_title">
|
||||
|
||||
<Preference
|
||||
|
@@ -18,7 +18,6 @@
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="bug_report_handler_screen"
|
||||
android:title="@string/bug_report_handler_title"
|
||||
settings:staticPreferenceLocation="append" >
|
||||
</PreferenceScreen>
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="current_screensaver_screen"
|
||||
android:title="@string/screensaver_settings_current" />
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="voice_input_settings_screen"
|
||||
android:title="@string/voice_input_settings_title" />
|
||||
|
@@ -17,8 +17,7 @@
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="enterprise_set_default_apps_settings"
|
||||
android:title="@string/enterprise_privacy_enterprise_set_default_apps">
|
||||
android:key="enterprise_set_default_apps_settings">
|
||||
<PreferenceCategory
|
||||
android:key="dashboard_tile_placeholder"/>
|
||||
</PreferenceScreen>
|
||||
|
@@ -17,6 +17,5 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="network_scorer_picker_screen"
|
||||
android:title="@string/network_scorer_picker_title">
|
||||
</PreferenceScreen>
|
@@ -16,7 +16,6 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="spellcheckers_screen"
|
||||
android:title="@string/spellcheckers_settings_title">
|
||||
<Preference
|
||||
android:key="spellchecker_language"
|
||||
|
@@ -18,7 +18,6 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="tether_prefs_screen"
|
||||
settings:keywords="@string/keywords_hotspot_tethering"
|
||||
android:title="@string/tether_settings_title_all">
|
||||
|
||||
<com.android.settings.widget.FixedLineSummaryPreference
|
||||
|
@@ -16,6 +16,6 @@
|
||||
-->
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/usb_default_label"
|
||||
android:title="@string/usb_pref"
|
||||
android:key="usb_default_fragment">
|
||||
</PreferenceScreen>
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="display_vr_pref_screen"
|
||||
android:title="@string/display_vr_pref_title" />
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="select_webview_provider_screen"
|
||||
android:title="@string/select_webview_provider_title" />
|
||||
|
@@ -17,5 +17,4 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="screensaver_when_to_dream_screen"
|
||||
android:title="@string/screensaver_settings_when_to_dream" />
|
||||
|
@@ -16,7 +16,6 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:key="wifi_p2p_settings_screen"
|
||||
android:title="@string/wifi_p2p_settings_title">
|
||||
<Preference
|
||||
android:key="p2p_this_device"
|
||||
|
@@ -19,7 +19,8 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="wifi_tether_settings_screen"
|
||||
android:title="@string/wifi_hotspot_checkbox_text">
|
||||
android:title="@string/wifi_hotspot_checkbox_text"
|
||||
settings:searchable="false">
|
||||
|
||||
<com.android.settings.wifi.tether.WifiTetherSsidPreference
|
||||
android:key="wifi_tether_network_name"
|
||||
|
Reference in New Issue
Block a user