Making fragments in system and tts packages searchable.
Bug: 153880283
Test: manual
Change-Id: I73d5af3dc069260ddb50e77614d4700d20032e79
diff --git a/src/com/android/car/settings/system/AboutSettingsFragment.java b/src/com/android/car/settings/system/AboutSettingsFragment.java
index 4171542..819edcb 100644
--- a/src/com/android/car/settings/system/AboutSettingsFragment.java
+++ b/src/com/android/car/settings/system/AboutSettingsFragment.java
@@ -16,14 +16,19 @@
package com.android.car.settings.system;
+import android.provider.Settings;
+
import androidx.annotation.XmlRes;
import com.android.car.settings.R;
import com.android.car.settings.common.SettingsFragment;
+import com.android.car.settings.search.CarBaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
/**
* Shows basic info about the system and provide some actions like update, reset etc.
*/
+@SearchIndexable
public class AboutSettingsFragment extends SettingsFragment {
@Override
@@ -31,4 +36,11 @@
protected int getPreferenceScreenResId() {
return R.xml.about_settings_fragment;
}
+
+ /**
+ * Data provider for Settings Search.
+ */
+ public static final CarBaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new CarBaseSearchIndexProvider(R.xml.about_settings_fragment,
+ Settings.ACTION_DEVICE_INFO_SETTINGS);
}
diff --git a/src/com/android/car/settings/system/LegalInformationFragment.java b/src/com/android/car/settings/system/LegalInformationFragment.java
index 69b9bc6..36f7711 100644
--- a/src/com/android/car/settings/system/LegalInformationFragment.java
+++ b/src/com/android/car/settings/system/LegalInformationFragment.java
@@ -19,11 +19,15 @@
import androidx.annotation.XmlRes;
import com.android.car.settings.R;
+import com.android.car.settings.common.CarSettingActivities.LegalInformationActivity;
import com.android.car.settings.common.SettingsFragment;
+import com.android.car.settings.search.CarBaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
/**
* Fragment showing legal information.
*/
+@SearchIndexable
public class LegalInformationFragment extends SettingsFragment {
@Override
@@ -31,4 +35,11 @@
protected int getPreferenceScreenResId() {
return R.xml.legal_information_fragment;
}
+
+ /**
+ * Data provider for Settings Search.
+ */
+ public static final CarBaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new CarBaseSearchIndexProvider(R.xml.legal_information_fragment,
+ LegalInformationActivity.class);
}
diff --git a/src/com/android/car/settings/system/ResetOptionsFragment.java b/src/com/android/car/settings/system/ResetOptionsFragment.java
index a0643cf..ae91f8c 100644
--- a/src/com/android/car/settings/system/ResetOptionsFragment.java
+++ b/src/com/android/car/settings/system/ResetOptionsFragment.java
@@ -17,15 +17,26 @@
package com.android.car.settings.system;
import com.android.car.settings.R;
+import com.android.car.settings.common.CarSettingActivities.ResetOptionsActivity;
import com.android.car.settings.common.SettingsFragment;
+import com.android.car.settings.search.CarBaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
/**
* Shows options to reset network settings, reset app preferences, and factory reset the device.
*/
+@SearchIndexable
public class ResetOptionsFragment extends SettingsFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.reset_options_fragment;
}
+
+ /**
+ * Data provider for Settings Search.
+ */
+ public static final CarBaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new CarBaseSearchIndexProvider(R.xml.reset_options_fragment,
+ ResetOptionsActivity.class);
}
diff --git a/src/com/android/car/settings/system/SystemSettingsFragment.java b/src/com/android/car/settings/system/SystemSettingsFragment.java
index 5b5efc2..b6db3ce 100644
--- a/src/com/android/car/settings/system/SystemSettingsFragment.java
+++ b/src/com/android/car/settings/system/SystemSettingsFragment.java
@@ -17,15 +17,26 @@
package com.android.car.settings.system;
import com.android.car.settings.R;
+import com.android.car.settings.common.CarSettingActivities.SystemSettingsActivity;
import com.android.car.settings.common.SettingsFragment;
+import com.android.car.settings.search.CarBaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
/**
* Shows basic info about the system and provide some actions like update, reset etc.
*/
+@SearchIndexable
public class SystemSettingsFragment extends SettingsFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.system_settings_fragment;
}
+
+ /**
+ * Data provider for Settings Search.
+ */
+ public static final CarBaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new CarBaseSearchIndexProvider(R.xml.system_settings_fragment,
+ SystemSettingsActivity.class);
}
diff --git a/src/com/android/car/settings/tts/TextToSpeechOutputFragment.java b/src/com/android/car/settings/tts/TextToSpeechOutputFragment.java
index bada2bd..b794a5f 100644
--- a/src/com/android/car/settings/tts/TextToSpeechOutputFragment.java
+++ b/src/com/android/car/settings/tts/TextToSpeechOutputFragment.java
@@ -19,9 +19,13 @@
import androidx.annotation.XmlRes;
import com.android.car.settings.R;
+import com.android.car.settings.common.CarSettingActivities.TextToSpeechOutputActivity;
import com.android.car.settings.common.SettingsFragment;
+import com.android.car.settings.search.CarBaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
/** Fragment to show the TTS settings. */
+@SearchIndexable
public class TextToSpeechOutputFragment extends SettingsFragment {
@Override
@@ -29,4 +33,11 @@
protected int getPreferenceScreenResId() {
return R.xml.text_to_speech_output_fragment;
}
+
+ /**
+ * Data provider for Settings Search.
+ */
+ public static final CarBaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new CarBaseSearchIndexProvider(R.xml.text_to_speech_output_fragment,
+ TextToSpeechOutputActivity.class);
}