Merge "Always index RingerModeAffected slices" into tm-qpr-dev am: 673e191e98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20960954 Change-Id: Ib413d02f2fea5f9b379cd0425df4fd17b25660a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
fd4ecf54b1
@@ -52,6 +52,7 @@ import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.PreferenceXmlParserUtils;
|
||||
import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.notification.RingerModeAffectedVolumePreferenceController;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settingslib.search.Indexable.SearchIndexProvider;
|
||||
@@ -202,7 +203,10 @@ class SliceDataConverter {
|
||||
final BasePreferenceController controller = SliceBuilderUtils
|
||||
.getPreferenceController(mContext, controllerClassName, key);
|
||||
// Only add pre-approved Slices available on the device.
|
||||
if (!controller.isSliceable() || !controller.isAvailable()) {
|
||||
// Always index RingerModeAffected slices so they are available for panel
|
||||
if (!controller.isSliceable()
|
||||
|| !(controller.isAvailable()
|
||||
|| controller instanceof RingerModeAffectedVolumePreferenceController)) {
|
||||
continue;
|
||||
}
|
||||
final String title = bundle.getString(METADATA_TITLE);
|
||||
|
Reference in New Issue
Block a user