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

3
src/com/android/settings/notification/AppBubbleNotificationSettings.java
View File

@@ -23,7 +23,6 @@ import android.util.Log;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
@@ -99,7 +98,7 @@ public class AppBubbleNotificationSettings extends NotificationSettingsBase impl
super.onPause();
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override

8
src/com/android/settings/notification/ConfigureNotificationSettings.java
View File

@@ -28,7 +28,6 @@ import android.os.Bundle;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
@@ -43,13 +42,10 @@ import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
@@ -80,7 +76,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
@Override
protected int getPreferenceScreenResId() {
return R.xml.configure_notification_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -217,7 +213,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
/**
* For Search.
*/
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.configure_notification_settings) {
@Override

2
src/com/android/settings/notification/NotificationAccessSettings.java
View File

@@ -190,6 +190,6 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
}
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.notification_access_settings);
}

8
src/com/android/settings/notification/NotificationAssistantPicker.java
View File

@@ -23,18 +23,14 @@ import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.graphics.drawable.Drawable;
import android.os.RemoteException;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.service.notification.NotificationAssistantService;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.applications.ServiceListing;
import com.android.settingslib.widget.CandidateInfo;
@@ -78,7 +74,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem
@Override
protected int getPreferenceScreenResId() {
return R.xml.notification_assistant_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -128,7 +124,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem
mCandidateInfos = list;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.notification_assistant_settings);
public static class CandidateNone extends CandidateInfo {

6
src/com/android/settings/notification/ZenAccessSettings.java
View File

@@ -25,7 +25,6 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.util.ArraySet;
import android.view.View;
@@ -37,7 +36,6 @@ import com.android.settings.applications.specialaccess.zenaccess.ZenAccessContro
import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails;
import com.android.settings.applications.specialaccess.zenaccess.ZenAccessSettingObserverMixin;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.widget.EmptyTextSettings;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.apppreference.AppPreference;
@@ -80,7 +78,7 @@ public class ZenAccessSettings extends EmptyTextSettings implements
@Override
protected int getPreferenceScreenResId() {
return R.xml.zen_access_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -159,6 +157,6 @@ public class ZenAccessSettings extends EmptyTextSettings implements
: R.string.app_permission_summary_not_allowed;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_access_settings);
}

6
src/com/android/settings/notification/ZenModeAutomationSettings.java
View File

@@ -23,7 +23,6 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.service.notification.ConditionProviderService;
import android.view.Menu;
import android.view.MenuInflater;
@@ -33,7 +32,6 @@ import androidx.fragment.app.Fragment;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ZenServiceListing;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -81,7 +79,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
@Override
protected int getPreferenceScreenResId() {
return R.xml.zen_mode_automation_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -148,7 +146,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
/**
* For Search.
*/
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_automation_settings) {
@Override

5
src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
View File

@@ -27,7 +27,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -82,7 +81,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
@Override
protected int getPreferenceScreenResId() {
return R.xml.zen_mode_block_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -93,7 +92,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_block_settings) {
@Override

5
src/com/android/settings/notification/ZenModeBypassingAppsSettings.java
View File

@@ -20,7 +20,6 @@ import android.app.Activity;
import android.app.Application;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import androidx.fragment.app.Fragment;
@@ -59,7 +58,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
@Override
protected int getPreferenceScreenResId() {
return R.xml.zen_mode_bypassing_apps;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -75,7 +74,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_bypassing_apps) {
@Override

2
src/com/android/settings/notification/ZenModeCallsSettings.java
View File

@@ -67,7 +67,7 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase implements Indexab
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_calls_settings) {
@Override

5
src/com/android/settings/notification/ZenModeMessagesSettings.java
View File

@@ -20,7 +20,6 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,7 +52,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde
@Override
protected int getPreferenceScreenResId() {
return R.xml.zen_mode_messages_settings;
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -64,7 +63,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_messages_settings) {
@Override

2
src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
View File

@@ -77,7 +77,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_restrict_notifications_settings) {
@Override

2
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -313,7 +313,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
/**
* For Search.
*/
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_settings) {
@Override

2
src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
View File

@@ -70,7 +70,7 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement
/**
* For Search.
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.zen_mode_sound_vibration_settings) {
@Override