Add some pages to search index.
* Notification access page
* VR Listener page
* Feature flags in dev options
* QS Tile developer options
* User dictionary
* Billing cycle
* Some accessibilty pages
Bug: 70720645
Test: robotests
Change-Id: I4f7d3d65b2803cebf178ac345a79721232df707c
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9a3a179..efea32c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2423,7 +2423,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.applications.VrListenerSettings" />
+ android:value="com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings" />
</activity>
<activity
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index 6bd6c4d..bb77002 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -14,12 +14,14 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/accessibility_autoclick_preference_title">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="autoclick_preference_screen"
+ android:title="@string/accessibility_autoclick_preference_title">
<com.android.settings.widget.SeekBarPreference
android:key="autoclick_delay"
- android:title="@string/accessibility_autoclick_delay_preference_title"/>
+ android:title="@string/accessibility_autoclick_delay_preference_title" />
</PreferenceScreen>
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 9b553ac..fc26fd3 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -14,8 +14,10 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/accessibility_display_daltonizer_preference_title" >
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="daltonizer_preference_screen"
+ android:title="@string/accessibility_display_daltonizer_preference_title">
<ListPreference
android:entries="@array/daltonizer_type_entries"
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index bef1351..9dda18f 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -76,7 +76,7 @@
<Preference
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
- android:key="autoclick_preference_screen"
+ android:key="autoclick_preference"
android:title="@string/accessibility_autoclick_preference_title"/>
<SwitchPreference
@@ -129,7 +129,7 @@
<Preference
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
- android:key="daltonizer_preference_screen"
+ android:key="daltonizer_preference"
android:title="@string/accessibility_display_daltonizer_preference_title"
android:icon="@drawable/ic_daltonizer"/>
diff --git a/res/xml/billing_cycle.xml b/res/xml/billing_cycle.xml
index 2338a13..3720240 100644
--- a/res/xml/billing_cycle.xml
+++ b/res/xml/billing_cycle.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="billing_cycle_settings"
android:title="@string/billing_cycle">
<Preference
diff --git a/res/xml/development_tile_settings.xml b/res/xml/development_tile_settings.xml
index f0f71c0..3ce6694 100644
--- a/res/xml/development_tile_settings.xml
+++ b/res/xml/development_tile_settings.xml
@@ -17,4 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/quick_settings_developer_tiles" />
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="development_tile_settings"
+ android:title="@string/quick_settings_developer_tiles"
+ settings:controller="com.android.settings.development.qstile.DevelopmentTilePreferenceController" />
diff --git a/res/xml/feature_flags_settings.xml b/res/xml/feature_flags_settings.xml
index db652ff..8dc5ab3 100644
--- a/res/xml/feature_flags_settings.xml
+++ b/res/xml/feature_flags_settings.xml
@@ -17,4 +17,12 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/feature_flags_dashboard_title" />
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="feature_flags_settings"
+ android:title="@string/feature_flags_dashboard_title">
+ <PreferenceCategory
+ android:key="feature_flag_category"
+ android:layout="@layout/preference_category_no_label"
+ android:title="@string/summary_placeholder"
+ settings:controller="com.android.settings.development.featureflags.FeatureFlagsPreferenceController" />
+</PreferenceScreen>
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 747d1b4..ec15f0d 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -63,7 +63,9 @@
<!-- User dictionary preference title and fragment will be set programmatically. -->
<Preference
android:key="key_user_dictionary_settings"
- android:title="@string/user_dict_settings_title" />
+ android:title="@string/user_dict_settings_title"
+ android:fragment="com.android.settings.inputmethod.UserDictionaryList"
+ settings:controller="com.android.settings.language.UserDictionaryPreferenceController" />
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/notification_access_settings.xml b/res/xml/notification_access_settings.xml
index 1300140..4dbaf88 100644
--- a/res/xml/notification_access_settings.xml
+++ b/res/xml/notification_access_settings.xml
@@ -17,4 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/manage_notification_access_title" />
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="notification_access_screen"
+ android:title="@string/manage_notification_access_title"
+ settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessScreenPreferenceController" />
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 552f0fc..a6c2159 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -68,7 +68,7 @@
android:key="notification_access"
android:title="@string/manage_notification_access_title"
android:fragment="com.android.settings.notification.NotificationAccessSettings"
- settings:controller="com.android.settings.applications.specialaccess.NotificationAccessController" />
+ settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessController" />
<Preference
android:key="picture_in_picture"
@@ -112,9 +112,9 @@
<Preference
android:key="enabled_vr_listeners"
android:title="@string/vr_listeners_title"
- android:fragment="com.android.settings.applications.VrListenerSettings"
+ android:fragment="com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings"
settings:keywords="@string/keywords_vr_listener"
- settings:controller="com.android.settings.applications.specialaccess.EnabledVrListenersController">
+ settings:controller="com.android.settings.applications.specialaccess.vrlistener.EnabledVrListenersController">
<extra
android:name="classname"
android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
diff --git a/res/xml/vr_listeners_settings.xml b/res/xml/vr_listeners_settings.xml
index 1954596..ffd8545 100644
--- a/res/xml/vr_listeners_settings.xml
+++ b/res/xml/vr_listeners_settings.xml
@@ -17,4 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/vr_listeners_title" />
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="vr_listener_settings"
+ android:title="@string/vr_listeners_title"
+ settings:controller="com.android.settings.applications.specialaccess.vrlistener.VrListenerScreenPreferenceController" />
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index ab38d2d..b910130 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -119,11 +119,11 @@
private static final String TTS_SETTINGS_PREFERENCE =
"tts_settings_preference";
private static final String AUTOCLICK_PREFERENCE_SCREEN =
- "autoclick_preference_screen";
+ "autoclick_preference";
private static final String VIBRATION_PREFERENCE_SCREEN =
"vibration_preference_screen";
private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
- "daltonizer_preference_screen";
+ "daltonizer_preference";
// Extras passed to sub-fragments.
static final String EXTRA_PREFERENCE_KEY = "preference_key";
@@ -882,6 +882,9 @@
// Duplicates in Language & Input
keys.add(TTS_SETTINGS_PREFERENCE);
+ // Duplicates in child page
+ keys.add(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
+ keys.add(AUTOCLICK_PREFERENCE_SCREEN);
return keys;
}
};
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 15857b3..97be2b3 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -16,16 +16,24 @@
package com.android.settings.accessibility;
+import android.content.Context;
import android.content.res.Resources;
import android.os.Bundle;
+import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
import com.android.settings.widget.SeekBarPreference;
import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
import androidx.preference.Preference;
@@ -33,6 +41,7 @@
* Fragment for preference screen for settings related to Automatically click after mouse stops
* feature.
*/
+@SearchIndexable
public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFragment
implements SwitchBar.OnSwitchChangeListener, Preference.OnPreferenceChangeListener {
@@ -178,4 +187,18 @@
private int delayToSeekBarProgress(int delay) {
return (delay - MIN_AUTOCLICK_DELAY) / AUTOCLICK_DELAY_STEP;
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.accessibility_autoclick_settings;
+ result.add(sir);
+ return result;
+ }
+ };
}
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 2885ee6..bb7bb9e 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -16,18 +16,27 @@
package com.android.settings.accessibility;
+import android.content.Context;
import android.os.Bundle;
+import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+@SearchIndexable
public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
@@ -117,4 +126,19 @@
public void onSwitchChanged(Switch switchView, boolean isChecked) {
onPreferenceToggled(mPreferenceKey, isChecked);
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.accessibility_daltonizer_settings;
+ result.add(sir);
+ return result;
+ }
+ };
+
}
diff --git a/src/com/android/settings/applications/specialaccess/ZenAccessController.java b/src/com/android/settings/applications/specialaccess/ZenAccessController.java
index ada5d9d..5ae2bd3 100644
--- a/src/com/android/settings/applications/specialaccess/ZenAccessController.java
+++ b/src/com/android/settings/applications/specialaccess/ZenAccessController.java
@@ -23,13 +23,16 @@
public class ZenAccessController extends BasePreferenceController {
+ private final ActivityManager mActivityManager;
+
public ZenAccessController(Context context, String preferenceKey) {
super(context, preferenceKey);
+ mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
}
@Override
public int getAvailabilityStatus() {
- return !ActivityManager.isLowRamDeviceStatic()
+ return !mActivityManager.isLowRamDevice()
? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/src/com/android/settings/applications/specialaccess/NotificationAccessController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessController.java
similarity index 90%
rename from src/com/android/settings/applications/specialaccess/NotificationAccessController.java
rename to src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessController.java
index 773cd7d..f9e8fe3 100644
--- a/src/com/android/settings/applications/specialaccess/NotificationAccessController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.notificationaccess;
import android.app.ActivityManager;
import android.content.Context;
@@ -30,7 +30,7 @@
@Override
public int getAvailabilityStatus() {
return !ActivityManager.isLowRamDeviceStatic()
- ? AVAILABLE
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
}
diff --git a/src/com/android/settings/applications/specialaccess/NotificationAccessController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessScreenPreferenceController.java
similarity index 78%
copy from src/com/android/settings/applications/specialaccess/NotificationAccessController.java
copy to src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessScreenPreferenceController.java
index 773cd7d..b86489d 100644
--- a/src/com/android/settings/applications/specialaccess/NotificationAccessController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessScreenPreferenceController.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.notificationaccess;
import android.app.ActivityManager;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
-public class NotificationAccessController extends BasePreferenceController {
+public class NotificationAccessScreenPreferenceController extends BasePreferenceController {
- public NotificationAccessController(Context context, String preferenceKey) {
+ public NotificationAccessScreenPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
diff --git a/src/com/android/settings/applications/specialaccess/EnabledVrListenersController.java b/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersController.java
similarity index 79%
rename from src/com/android/settings/applications/specialaccess/EnabledVrListenersController.java
rename to src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersController.java
index 5967b0d..fd59d8d 100644
--- a/src/com/android/settings/applications/specialaccess/EnabledVrListenersController.java
+++ b/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.vrlistener;
import android.app.ActivityManager;
import android.content.Context;
@@ -24,15 +24,18 @@
public class EnabledVrListenersController extends BasePreferenceController {
+ private final ActivityManager mActivityManager;
+
public EnabledVrListenersController(Context context, String key) {
super(context, key);
+ mActivityManager = mContext.getSystemService(ActivityManager.class);
}
@AvailabilityStatus
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_enabled_vr_listeners)
- && !ActivityManager.isLowRamDeviceStatic()
- ? AVAILABLE
+ && !mActivityManager.isLowRamDevice()
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/EnabledVrListenersController.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceController.java
similarity index 67%
copy from src/com/android/settings/applications/specialaccess/EnabledVrListenersController.java
copy to src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceController.java
index 5967b0d..655db87 100644
--- a/src/com/android/settings/applications/specialaccess/EnabledVrListenersController.java
+++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.vrlistener;
import android.app.ActivityManager;
import android.content.Context;
@@ -22,16 +22,19 @@
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-public class EnabledVrListenersController extends BasePreferenceController {
+public class VrListenerScreenPreferenceController extends BasePreferenceController {
- public EnabledVrListenersController(Context context, String key) {
+ private final ActivityManager mActivityManager;
+
+ public VrListenerScreenPreferenceController(Context context, String key) {
super(context, key);
+ mActivityManager = mContext.getSystemService(ActivityManager.class);
}
@AvailabilityStatus
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_enabled_vr_listeners)
- && !ActivityManager.isLowRamDeviceStatic()
+ && !mActivityManager.isLowRamDevice()
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/src/com/android/settings/applications/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
similarity index 72%
rename from src/com/android/settings/applications/VrListenerSettings.java
rename to src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
index ea88ae4..82604e0 100644
--- a/src/com/android/settings/applications/VrListenerSettings.java
+++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
@@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.applications;
+package com.android.settings.applications.specialaccess.vrlistener;
import android.content.ComponentName;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.service.vr.VrListenerService;
@@ -23,8 +25,15 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
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;
+
+@SearchIndexable
public class VrListenerSettings extends ManagedServiceSettings {
private static final String TAG = VrListenerSettings.class.getSimpleName();
private static final Config CONFIG = new Config.Builder()
@@ -66,4 +75,19 @@
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
logCategory, packageName);
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final List<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.vr_listeners_settings;
+ result.add(sir);
+ return result;
+ }
+ };
+
}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index a325c4c..1569ff0 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -38,7 +38,7 @@
import com.android.settings.applications.ProcessStatsSummary;
import com.android.settings.applications.ProcessStatsUi;
import com.android.settings.applications.UsageAccessDetails;
-import com.android.settings.applications.VrListenerSettings;
+import com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.applications.appinfo.DrawOverlayDetails;
import com.android.settings.applications.appinfo.ExternalSourcesDetails;
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 8360df8..197053a 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -26,6 +26,7 @@
import android.net.NetworkPolicy;
import android.net.NetworkTemplate;
import android.os.Bundle;
+import android.provider.SearchIndexableResource;
import android.text.format.Time;
import android.util.Log;
import android.view.LayoutInflater;
@@ -38,12 +39,19 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.net.DataUsageController;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+@SearchIndexable
public class BillingCycleSettings extends DataUsageBase implements
Preference.OnPreferenceChangeListener, DataUsageEditController {
@@ -450,4 +458,24 @@
.putBoolean(KEY_SET_DATA_LIMIT, true).apply();
}
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.billing_cycle;
+ result.add(sir);
+ return result;
+ }
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return DataUsageUtils.hasMobileData(context);
+ }
+ };
+
}
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index ee8a6c8..c1f9f52 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -368,7 +368,6 @@
keys.add(KEY_MOBILE_USAGE_TITLE);
keys.add(KEY_MOBILE_DATA_USAGE_TOGGLE);
keys.add(KEY_MOBILE_DATA_USAGE);
- keys.add(KEY_MOBILE_BILLING_CYCLE);
}
if (!DataUsageUtils.hasWifiRadio(context)) {
@@ -380,6 +379,8 @@
// Duplicate entry for "Data saver"
keys.add(KEY_RESTRICT_BACKGROUND);
+ // Duplicate entry for "Data warning & limit"
+ keys.add(KEY_MOBILE_BILLING_CYCLE);
return keys;
}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
index 2e9cac9..038b149 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
@@ -17,16 +17,22 @@
package com.android.settings.development.featureflags;
import android.content.Context;
+import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
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.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
+@SearchIndexable
public class FeatureFlagsDashboard extends DashboardFragment {
private static final String TAG = "FeatureFlagsDashboard";
@@ -59,13 +65,43 @@
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+ return buildPrefControllers(context, getLifecycle());
+ }
+
+ private static List<AbstractPreferenceController> buildPrefControllers(Context context,
+ Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- final Lifecycle lifecycle = getLifecycle();
final FeatureFlagFooterPreferenceController footerController =
new FeatureFlagFooterPreferenceController(context);
- controllers.add(new FeatureFlagsPreferenceController(context, lifecycle));
+ if (lifecycle != null) {
+ lifecycle.addObserver(footerController);
+ }
controllers.add(footerController);
- lifecycle.addObserver(footerController);
return controllers;
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final List<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.feature_flags_settings;
+ result.add(sir);
+ return result;
+ }
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
+ }
+
+ @Override
+ public List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return buildPrefControllers(context, null /* lifecycle */);
+ }
+ };
}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
index 33ee3b7..6de83a8 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
@@ -19,57 +19,48 @@
import android.content.Context;
import android.util.FeatureFlagUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import java.util.Map;
+import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
-public class FeatureFlagsPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, LifecycleObserver, OnStart {
+public class FeatureFlagsPreferenceController extends BasePreferenceController
+ implements LifecycleObserver, OnStart {
- private PreferenceScreen mScreen;
+ private PreferenceGroup mGroup;
- public FeatureFlagsPreferenceController(Context context, Lifecycle lifecycle) {
- super(context);
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
+ public FeatureFlagsPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public String getPreferenceKey() {
- return null;
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mScreen = screen;
+ mGroup = (PreferenceGroup) screen.findPreference(getPreferenceKey());
}
@Override
public void onStart() {
- if (mScreen == null) {
+ if (mGroup == null) {
return;
}
final Map<String, String> featureMap = FeatureFlagUtils.getAllFeatureFlags();
if (featureMap == null) {
return;
}
- mScreen.removeAll();
- final Context prefContext = mScreen.getContext();
+ mGroup.removeAll();
+ final Context prefContext = mGroup.getContext();
for (String feature : featureMap.keySet()) {
- mScreen.addPreference(new FeatureFlagPreference(prefContext, feature));
+ mGroup.addPreference(new FeatureFlagPreference(prefContext, feature));
}
}
}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
index 24bb5d1..795d26c 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
@@ -17,15 +17,20 @@
package com.android.settings.development.qstile;
import android.content.Context;
+import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
+@SearchIndexable
public class DevelopmentTileConfigFragment extends DashboardFragment {
private static final String TAG = "DevelopmentTileConfig";
@@ -40,14 +45,26 @@
}
@Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new DevelopmentTilePreferenceController(context));
- return controllers;
- }
-
- @Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEVELOPMENT_QS_TILE_CONFIG;
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final List<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.development_tile_settings;
+ result.add(sir);
+ return result;
+ }
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
+ }
+ };
}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
index 7834aa9..4d12b39 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
@@ -28,7 +28,7 @@
import android.util.Log;
import com.android.internal.statusbar.IStatusBarService;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.core.BasePreferenceController;
import java.util.List;
@@ -37,33 +37,28 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-public class DevelopmentTilePreferenceController extends AbstractPreferenceController {
+public class DevelopmentTilePreferenceController extends BasePreferenceController {
private static final String TAG = "DevTilePrefController";
private final OnChangeHandler mOnChangeHandler;
private final PackageManager mPackageManager;
- public DevelopmentTilePreferenceController(Context context) {
- super(context);
+ public DevelopmentTilePreferenceController(Context context, String key) {
+ super(context, key);
mOnChangeHandler = new OnChangeHandler(context);
mPackageManager = context.getPackageManager();
}
@Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public String getPreferenceKey() {
- return null;
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- Context context = screen.getContext();
- Intent intent = new Intent(TileService.ACTION_QS_TILE)
+ final Context context = screen.getContext();
+ final Intent intent = new Intent(TileService.ACTION_QS_TILE)
.setPackage(context.getPackageName());
final List<ResolveInfo> resolveInfos = mPackageManager.queryIntentServices(intent,
PackageManager.MATCH_DISABLED_COMPONENTS);
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 46723bc..b3ea47e 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -19,11 +19,19 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
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.util.ArrayList;
+import java.util.List;
+
+@SearchIndexable
public class UserDictionaryList extends DashboardFragment {
private static final String TAG = "UserDictionaryList";
@@ -66,4 +74,18 @@
protected String getLogTag() {
return TAG;
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.user_dictionary_list_fragment;
+ result.add(sir);
+ return result;
+ }
+ };
}
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 01b7a6c..507e6cb 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -57,7 +57,6 @@
private static final String KEY_KEYBOARDS_CATEGORY = "keyboards_category";
private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary";
private static final String KEY_POINTER_AND_TTS_CATEGORY = "pointer_and_tts_category";
- private static final String KEY_GAME_CONTROLLER_CATEGORY = "game_controller_settings_category";
private static final String KEY_PHYSICAL_KEYBOARD = "physical_keyboard_pref";
@Override
@@ -124,7 +123,6 @@
// Input Assistance
controllers.add(new SpellCheckerPreferenceController(context));
controllers.add(new DefaultAutofillPreferenceController(context));
- controllers.add(new UserDictionaryPreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java
index 0238dc2..fdc1aa9 100644
--- a/src/com/android/settings/language/UserDictionaryPreferenceController.java
+++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java
@@ -20,33 +20,24 @@
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.inputmethod.UserDictionaryListPreferenceController;
import com.android.settings.inputmethod.UserDictionarySettings;
-import com.android.settingslib.core.AbstractPreferenceController;
import java.util.TreeSet;
import androidx.preference.Preference;
-public class UserDictionaryPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin {
+public class UserDictionaryPreferenceController extends BasePreferenceController {
- private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
-
- public UserDictionaryPreferenceController(Context context) {
- super(context);
+ public UserDictionaryPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_USER_DICTIONARY_SETTINGS;
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
}
@Override
diff --git a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
index 783e05e..39f0195 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
@@ -20,6 +20,7 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.nfc.NfcAdapter;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -82,6 +83,9 @@
if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
return UNSUPPORTED_ON_DEVICE;
}
+ if (NfcAdapter.getDefaultAdapter(mContext) == null) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
if (mPaymentBackend == null) {
mPaymentBackend = new PaymentBackend(mContext);
}
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 4180a53..a7e3393 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -24,6 +24,7 @@
import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
+import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
@@ -32,14 +33,21 @@
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
*/
+@SearchIndexable
public class NotificationAccessSettings extends ManagedServiceSettings {
- private static final String TAG = NotificationAccessSettings.class.getSimpleName();
- private static final Config CONFIG = new Config.Builder()
+ private static final String TAG = "NotificationAccessSettings";
+ private static final Config CONFIG = new Config.Builder()
.setTag(TAG)
.setSetting(Settings.Secure.ENABLED_NOTIFICATION_LISTENERS)
.setIntentAction(NotificationListenerService.SERVICE_INTERFACE)
@@ -166,4 +174,18 @@
.create();
}
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final List<SearchIndexableResource> result = new ArrayList<>();
+
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.notification_access_settings;
+ result.add(sir);
+ return result;
+ }
+ };
}
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index c3cb897..a662f2f 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -1,8 +1,6 @@
com.android.settings.accessibility.AccessibilitySettingsForSetupWizard
com.android.settings.accessibility.CaptionPropertiesFragment
com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment
-com.android.settings.accessibility.ToggleAutoclickPreferenceFragment
-com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment
com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard
com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard
@@ -24,18 +22,14 @@
com.android.settings.applications.RunningServices
com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails
com.android.settings.applications.UsageAccessDetails
-com.android.settings.applications.VrListenerSettings
com.android.settings.backup.ToggleBackupSettingFragment
com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment
com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
com.android.settings.bluetooth.BluetoothPairingDetail
com.android.settings.bluetooth.DevicePickerFragment
com.android.settings.datausage.AppDataUsage
-com.android.settings.datausage.BillingCycleSettings
com.android.settings.datausage.DataUsageList
com.android.settings.datetime.timezone.TimeZoneSettings
-com.android.settings.development.featureflags.FeatureFlagsDashboard
-com.android.settings.development.qstile.DevelopmentTileConfigFragment
com.android.settings.deviceinfo.PrivateVolumeSettings
com.android.settings.deviceinfo.PublicVolumeSettings
com.android.settings.deviceinfo.StorageProfileFragment
@@ -53,14 +47,12 @@
com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
com.android.settings.inputmethod.KeyboardLayoutPickerFragment
com.android.settings.inputmethod.SpellCheckersSettings
-com.android.settings.inputmethod.UserDictionaryList
com.android.settings.localepicker.LocaleListEditor
com.android.settings.network.ApnEditor
com.android.settings.network.ApnSettings
com.android.settings.notification.AppNotificationSettings
com.android.settings.notification.ChannelGroupNotificationSettings
com.android.settings.notification.ChannelNotificationSettings
-com.android.settings.notification.NotificationAccessSettings
com.android.settings.notification.NotificationStation
com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
com.android.settings.notification.ZenModeEventRuleSettings
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java
index 205de10..da2bc0a 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java
@@ -51,6 +51,6 @@
@Test
public void isAvailable_lowMemory_false() {
mActivityManager.setIsLowRamDevice(true);
- assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.isAvailable()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java
similarity index 68%
rename from tests/robotests/src/com/android/settings/applications/specialaccess/EnabledVrListenersControllerTest.java
rename to tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java
index 7963fd4..3fb9045 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/EnabledVrListenersControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.vrlistener;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
@@ -45,19 +47,19 @@
}
@Test
- public void isAvailable_byDefault_true() {
- assertThat(mController.isAvailable()).isTrue();
+ public void getAvailability_byDefault_unsearchable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
- public void isAvailable_lowMemory_false() {
+ public void getAvailability_lowMemory_unavailable() {
mActivityManager.setIsLowRamDevice(true);
- assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@Config(qualifiers = "mcc999")
- public void isAvailable_disabled_false() {
- assertThat(mController.isAvailable()).isFalse();
+ public void getAvailability_disabled_unavailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java
similarity index 61%
copy from tests/robotests/src/com/android/settings/applications/specialaccess/EnabledVrListenersControllerTest.java
copy to tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java
index 7963fd4..c5734f9 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/EnabledVrListenersControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-package com.android.settings.applications.specialaccess;
+package com.android.settings.applications.specialaccess.vrlistener;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
@@ -31,33 +33,33 @@
import org.robolectric.shadows.ShadowActivityManager;
@RunWith(SettingsRobolectricTestRunner.class)
-public class EnabledVrListenersControllerTest {
+public class VrListenerScreenPreferenceControllerTest {
private Context mContext;
- private EnabledVrListenersController mController;
+ private VrListenerScreenPreferenceController mController;
private ShadowActivityManager mActivityManager;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mController = new EnabledVrListenersController(mContext, "key");
+ mController = new VrListenerScreenPreferenceController(mContext, "key");
mActivityManager = Shadow.extract(mContext.getSystemService(Context.ACTIVITY_SERVICE));
}
@Test
- public void isAvailable_byDefault_true() {
- assertThat(mController.isAvailable()).isTrue();
+ public void getAvailability_byDefault_searchable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
- public void isAvailable_lowMemory_false() {
+ public void getAvailability_lowMemory_unavailable() {
mActivityManager.setIsLowRamDevice(true);
- assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@Config(qualifiers = "mcc999")
- public void isAvailable_disabled_false() {
- assertThat(mController.isAvailable()).isFalse();
+ public void getAvailability_disabled_unavailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java
similarity index 92%
rename from tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
rename to tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java
index 516d248..4f5b2bb 100644
--- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -11,10 +11,10 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License
+ * limitations under the License.
*/
-package com.android.settings.applications;
+package com.android.settings.applications.specialaccess.vrlistener;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
index 3a9d89a..c9c9753 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
@@ -16,7 +16,7 @@
package com.android.settings.development.featureflags;
-import static androidx.lifecycle.Lifecycle.Event.ON_START;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.atLeastOnce;
@@ -26,7 +26,6 @@
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
@@ -35,7 +34,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -43,33 +42,31 @@
@Mock
private PreferenceScreen mScreen;
+ @Mock
+ private PreferenceCategory mCategory;
private Context mContext;
- private LifecycleOwner mLifecycleOwner;
- private Lifecycle mLifecycle;
private FeatureFlagsPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLifecycleOwner = () -> mLifecycle;
- mLifecycle = new Lifecycle(mLifecycleOwner);
- mController = new FeatureFlagsPreferenceController(mContext, mLifecycle);
- when(mScreen.getContext()).thenReturn(mContext);
+ mController = new FeatureFlagsPreferenceController(mContext, "test_key");
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mCategory);
+ when(mCategory.getContext()).thenReturn(mContext);
mController.displayPreference(mScreen);
}
@Test
- public void verifyConstants() {
- assertThat(mController.isAvailable()).isTrue();
- assertThat(mController.getPreferenceKey()).isNull();
+ public void getAvailability_available() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void onStart_shouldRefreshFeatureFlags() {
- mLifecycle.handleLifecycleEvent(ON_START);
+ mController.onStart();
- verify(mScreen).removeAll();
- verify(mScreen, atLeastOnce()).addPreference(any(FeatureFlagPreference.class));
+ verify(mCategory).removeAll();
+ verify(mCategory, atLeastOnce()).addPreference(any(FeatureFlagPreference.class));
}
}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
index 3043019..c42d46c 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
@@ -70,9 +70,7 @@
mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
when(mScreen.getContext()).thenReturn(mContext);
- mController = new DevelopmentTilePreferenceController(mContext);
- assertThat(mController.getPreferenceKey()).isNull();
-
+ mController = new DevelopmentTilePreferenceController(mContext, "testkey");
mOnChangeHandler = spy(new DevelopmentTilePreferenceController.OnChangeHandler(mContext));
ReflectionHelpers.setField(mOnChangeHandler, "mStatusBarService", mStatusBarService);
}
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
index 0019f4d..29b5278 100644
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
@@ -100,7 +100,7 @@
}
private TestController(Context context) {
- super(context);
+ super(context, "test_key");
}
}
}