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

Directly use BaseIndexableProvider

Browse Source 
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
This commit is contained in:
Raff Tsai
2019-09-19 17:06:45 +08:00
parent 5ff9517f23
commit ac3e0d0988
122 changed files with 199 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/AssistGestureSettings.java
View File

@@ -66,7 +66,7 @@ public class AssistGestureSettings extends DashboardFragment {
return controllers;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(

2
src/com/android/settings/gestures/DoubleTapPowerSettings.java
View File

@@ -63,6 +63,6 @@ public class DoubleTapPowerSettings extends DashboardFragment {
return R.xml.double_tap_power_settings;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.double_tap_power_settings);
}

2
src/com/android/settings/gestures/DoubleTapScreenSettings.java
View File

@@ -72,6 +72,6 @@ public class DoubleTapScreenSettings extends DashboardFragment {
return R.string.help_url_double_tap_screen;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.double_tap_screen_settings);
}

2
src/com/android/settings/gestures/DoubleTwistGestureSettings.java
View File

@@ -63,7 +63,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
return R.xml.double_twist_gesture_settings;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(

2
src/com/android/settings/gestures/GestureSettings.java
View File

@@ -66,7 +66,7 @@ public class GestureSettings extends DashboardFragment {
return mAmbientDisplayConfig;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(

9
src/com/android/settings/gestures/GlobalActionsPanelSettings.java
View File

@@ -17,17 +17,12 @@
package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
public class GlobalActionsPanelSettings extends DashboardFragment {
@@ -45,9 +40,9 @@ public class GlobalActionsPanelSettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.global_actions_panel_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.global_actions_panel_settings);
}

8
src/com/android/settings/gestures/PickupGestureSettings.java
View File

@@ -20,7 +20,6 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
import android.hardware.display.AmbientDisplayConfiguration;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -29,9 +28,6 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
public class PickupGestureSettings extends DashboardFragment {
@@ -64,7 +60,7 @@ public class PickupGestureSettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.pick_up_gesture_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -72,7 +68,7 @@ public class PickupGestureSettings extends DashboardFragment {
return R.string.help_url_pickup_gesture;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.pick_up_gesture_settings);
}

2
src/com/android/settings/gestures/PreventRingingGestureSettings.java
View File

@@ -74,7 +74,7 @@ public class PreventRingingGestureSettings extends DashboardFragment {
return R.string.help_uri_prevent_ringing_gesture;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.prevent_ringing_gesture_settings) {
@Override

8
src/com/android/settings/gestures/SwipeToNotificationSettings.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.gestures;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.SharedPreferences;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -28,9 +27,6 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
public class SwipeToNotificationSettings extends DashboardFragment {
@@ -60,10 +56,10 @@ public class SwipeToNotificationSettings extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.swipe_to_notification_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.swipe_to_notification_settings) {
@Override

2
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -325,7 +325,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment {
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) == 1;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.system_navigation_gesture_settings) {
@Override

2
src/com/android/settings/gestures/TapScreenGestureSettings.java
View File

@@ -67,6 +67,6 @@ public class TapScreenGestureSettings extends DashboardFragment {
return R.xml.tap_screen_gesture_settings;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.tap_screen_gesture_settings);
}