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

Use SettingsLib Indexable

Browse Source 
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
This commit is contained in:
Raff Tsai
2019-09-25 11:19:06 +08:00
parent b722db9d41
commit 966fa01423
121 changed files with 131 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.configure_notification_settings;
}
@Override

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

@@ -24,7 +24,6 @@ import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
import android.widget.Toast;
@@ -37,13 +36,9 @@ import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
/**
* Settings screen for managing notification listener permissions
*/

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

@@ -74,7 +74,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.notification_assistant_settings;
}
@Override

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

@@ -78,7 +78,7 @@ public class ZenAccessSettings extends EmptyTextSettings implements
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.zen_access_settings;
}
@Override

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

@@ -79,7 +79,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.zen_mode_automation_settings;
}
@Override

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

@@ -30,9 +30,9 @@ import android.os.Bundle;
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.core.lifecycle.Lifecycle;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
@@ -81,7 +81,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.zen_mode_block_settings;
}
@Override

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

@@ -25,8 +25,8 @@ 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.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
@@ -58,7 +58,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.zen_mode_bypassing_apps;
}
@Override

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

@@ -20,13 +20,12 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
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.core.lifecycle.Lifecycle;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;

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

@@ -23,9 +23,9 @@ import android.content.Context;
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.core.lifecycle.Lifecycle;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
@@ -52,7 +52,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde
@Override
protected int getPreferenceScreenResId() {
return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
return R.xml.zen_mode_messages_settings;
}
@Override

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

@@ -23,7 +23,7 @@ import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;

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

@@ -39,7 +39,7 @@ import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;

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

@@ -22,7 +22,7 @@ import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;