PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicated index search data

Browse Source 
Bug: 143055215
Test: manual & robotest
Change-Id: I82583efe37c44014b8949a40d7a695461a7382a9
This commit is contained in:
Edgar Wang
2020-03-10 19:47:40 +08:00
parent e5110e9388
commit 71099e7a54
17 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/accessibility_settings.xml
View File

@@ -139,6 +139,7 @@
android:key="gesture_system_navigation_input_summary_accessibility"
android:persistent="false"
android:title="@string/system_navigation_title"
settings:searchable="false"
settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>
</PreferenceCategory>

1
res/xml/billing_cycle.xml
View File

@@ -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="billing_cycle_settings"
android:title="@string/billing_cycle">
<Preference

1
res/xml/bluetooth_screen.xml
View File

@@ -33,6 +33,7 @@
settings:allowDividerAbove="true"
settings:userRestriction="no_config_bluetooth"
settings:useAdminDisabledSummary="true"
settings:searchable="false"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
<com.android.settingslib.widget.FooterPreference

6
res/xml/configure_notification_settings.xml
View File

@@ -42,7 +42,8 @@
android:key="all_notifications"
android:title="@string/notifications_title"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
android:order="4">
android:order="4"
settings:searchable="false">
<extra
android:name="classname"
android:value="com.android.settings.Settings$NotificationAppListActivity"/>
@@ -136,7 +137,8 @@
android:title="@string/notification_ringtone_title"
android:dialogTitle="@string/notification_ringtone_title"
android:summary="@string/summary_placeholder"
android:ringtoneType="notification"/>
android:ringtoneType="notification"
settings:searchable="false"/>
<SwitchPreference
android:key="notification_people_strip"

1
res/xml/connected_devices_advanced.xml
View File

@@ -32,6 +32,7 @@
android:title="@string/nfc_quick_toggle_title"
android:icon="@drawable/ic_nfc"
android:order="-7"
settings:searchable="false"
settings:controller="com.android.settings.connecteddevice.NfcAndPaymentFragmentController"/>
<Preference

1
res/xml/data_saver.xml
View File

@@ -24,6 +24,7 @@
android:title="@string/unrestricted_data_saver"
android:summary="@string/summary_two_lines_placeholder"
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess"
settings:searchable="false"
settings:controller="com.android.settings.applications.specialaccess.DataSaverController" />
<com.android.settingslib.widget.FooterPreference

1
res/xml/default_autofill_picker_settings.xml
View File

@@ -26,6 +26,7 @@
android:key="default_autofill_main"
android:title="@string/autofill_app"
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
settings:searchable="false"
settings:keywords="@string/autofill_keywords">
<extra android:name="for_work" android:value="false" />
</com.android.settings.widget.GearPreference>

1
res/xml/firmware_version.xml
View File

@@ -27,6 +27,7 @@
android:title="@string/firmware_version"
android:summary="@string/summary_placeholder"
settings:enableCopying="true"
settings:searchable="false"
settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDetailPreferenceController"/>
<!-- Security patch -->

6
res/xml/gestures.xml
View File

@@ -30,18 +30,21 @@
android:key="gesture_swipe_down_fingerprint_input_summary"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController" />
<Preference
android:key="gesture_double_tap_power_input_summary"
android:title="@string/double_tap_power_for_camera_title"
android:fragment="com.android.settings.gestures.DoubleTapPowerSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.DoubleTapPowerPreferenceController" />
<Preference
android:key="gesture_double_twist_input_summary"
android:title="@string/double_twist_for_camera_mode_title"
android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.DoubleTwistPreferenceController" />
<Preference
@@ -54,18 +57,21 @@
android:key="gesture_tap_screen_input_summary"
android:title="@string/ambient_display_tap_screen_title"
android:fragment="com.android.settings.gestures.TapScreenGestureSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.TapScreenGesturePreferenceController" />
<Preference
android:key="gesture_double_tap_screen_input_summary"
android:title="@string/ambient_display_title"
android:fragment="com.android.settings.gestures.DoubleTapScreenSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.DoubleTapScreenPreferenceController" />
<Preference
android:key="gesture_pick_up_input_summary"
android:title="@string/ambient_display_pickup_title"
android:fragment="com.android.settings.gestures.PickupGestureSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.PickupGesturePreferenceController" />
<Preference

2
res/xml/mobile_network_list.xml
View File

@@ -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="mobile_network_list_screen"
android:title="@string/network_settings_title">
<com.android.settingslib.RestrictedPreference
@@ -25,6 +24,7 @@
settings:isPreferenceVisible="false"
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true"
settings:searchable="false"
android:title="@string/mobile_network_list_add_more"
android:icon="@drawable/ic_menu_add_activated_tint"
android:order="100" >

2
res/xml/privacy_dashboard_settings.xml
View File

@@ -46,7 +46,7 @@
android:title="@string/app_permissions"
android:summary="@string/summary_placeholder"
settings:allowDividerAbove="true"
settings:keywords="@string/keywords_app_permissions"
settings:searchable="false"
settings:controller="com.android.settings.applications.AppPermissionsPreferenceController">
<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
</Preference>

1
res/xml/privacy_settings.xml
View File

@@ -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="privacy_settings_screen"
android:title="@string/privacy_settings_title">
<!-- Backup settings -->

3
res/xml/security_lockscreen_settings.xml
View File

@@ -69,18 +69,21 @@
android:key="ambient_display_tap"
android:title="@string/ambient_display_tap_screen_title"
android:fragment="com.android.settings.gestures.TapScreenGestureSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.TapScreenGesturePreferenceController" />
<Preference
android:key="ambient_display_double_tap"
android:title="@string/ambient_display_title"
android:fragment="com.android.settings.gestures.DoubleTapScreenSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.DoubleTapScreenPreferenceController" />
<Preference
android:key="ambient_display_pick_up"
android:title="@string/ambient_display_pickup_title"
android:fragment="com.android.settings.gestures.PickupGestureSettings"
settings:searchable="false"
settings:controller="com.android.settings.gestures.PickupGesturePreferenceController" />
<SwitchPreference

1
res/xml/security_settings_face.xml
View File

@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="security_settings_face_settings_page"
android:title="@string/security_settings_face_preference_title">
<com.android.settings.widget.VideoPreference

1
res/xml/special_access.xml
View File

@@ -51,6 +51,7 @@
android:title="@string/manage_device_admin"
android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
android:summary="@string/summary_placeholder"
settings:searchable="false"
settings:controller="com.android.settings.enterprise.ManageDeviceAdminPreferenceController" />
<Preference

10
res/xml/zen_mode_restrict_notifications_settings.xml
View File

@@ -17,6 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/zen_mode_restrict_notifications_title">
<PreferenceCategory
@@ -25,16 +26,19 @@
<com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_mute_notifications"
android:title="@string/zen_mode_restrict_notifications_mute"
android:summary="@string/zen_mode_restrict_notifications_mute_summary"/>
android:summary="@string/zen_mode_restrict_notifications_mute_summary"
settings:searchable="false"/>
<com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_hide_notifications"
android:title="@string/zen_mode_restrict_notifications_hide"
android:summary="@string/zen_mode_restrict_notifications_hide_summary"/>
android:summary="@string/zen_mode_restrict_notifications_hide_summary"
settings:searchable="false"/>
<com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_custom"
android:title="@string/zen_mode_restrict_notifications_custom" />
android:title="@string/zen_mode_restrict_notifications_custom"
settings:searchable="false"/>
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference />

6
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -586,12 +586,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_apps_usage);
data.key = "storage_settings_apps_space";
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
data = new SearchIndexableRaw(context);
data.title = context.getString(R.string.memory_dcim_usage);
data.key = "storage_settings_dcim_space";