Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bf3d0a0 authored by Behnam Heydarshahi's avatar Behnam Heydarshahi Committed by Automerger Merge Worker
Browse files

Merge "Always index RingerModeAffected slices" into tm-qpr-dev am: 673e191e am: fd4ecf54 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20960954



Change-Id: I9889c6508f653f2f94b77b6450b86f888909e1f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69b8706b fd4ecf54

src/com/android/settings/slices/SliceDataConverter.java

+5 −1
Original line number Diff line number Diff line
@@ -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);