summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/display/NightDisplaySettings.java
diff options
context:
space:
mode:
authorRaff Tsai <rafftsai@google.com>2019-09-19 17:06:45 +0800
committerRaff Tsai <rafftsai@google.com>2019-09-24 00:35:52 +0800
commitac3e0d0988dc8d75c201f455f4fc2e134243044e (patch)
tree3beb455295f8f0a1578d16700bdb6f2aeef5d93c /src/com/android/settings/display/NightDisplaySettings.java
parent5ff9517f23af0299af5b4ca9959923f79cde512a (diff)
downloadpackages_apps_Settings-ac3e0d0988dc8d75c201f455f4fc2e134243044e.tar.gz
packages_apps_Settings-ac3e0d0988dc8d75c201f455f4fc2e134243044e.tar.bz2
packages_apps_Settings-ac3e0d0988dc8d75c201f455f4fc2e134243044e.zip
Directly use BaseIndexableProvider
- 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
Diffstat (limited to 'src/com/android/settings/display/NightDisplaySettings.java')
-rw-r--r--src/com/android/settings/display/NightDisplaySettings.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 490e4fa2c3..fa69d70dbd 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -23,19 +23,15 @@ import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.hardware.display.NightDisplayListener;
import android.os.Bundle;
-import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.List;
/**
* Settings screen for Night display.
@@ -157,7 +153,7 @@ public class NightDisplaySettings extends DashboardFragment
@Override
protected int getPreferenceScreenResId() {
- return R.xml.night_display_settings;
+ return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();
}
@Override
@@ -175,7 +171,7 @@ public class NightDisplaySettings extends DashboardFragment
return TAG;
}
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.night_display_settings) {
@Override