PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Behnam Heydarshahi
2023-01-17 14:57:00 +00:00
committed by Automerger Merge Worker
parent e4c447eb02 673e191e98
commit fd4ecf54b1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/slices/SliceDataConverter.java
View File

@@ -52,6 +52,7 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceXmlParserUtils; import com.android.settings.core.PreferenceXmlParserUtils;
import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.RingerModeAffectedVolumePreferenceController;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.search.Indexable.SearchIndexProvider; import com.android.settingslib.search.Indexable.SearchIndexProvider;
@@ -202,7 +203,10 @@ class SliceDataConverter {
final BasePreferenceController controller = SliceBuilderUtils final BasePreferenceController controller = SliceBuilderUtils
.getPreferenceController(mContext, controllerClassName, key); .getPreferenceController(mContext, controllerClassName, key);
// Only add pre-approved Slices available on the device. // 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; continue;
} }
final String title = bundle.getString(METADATA_TITLE); final String title = bundle.getString(METADATA_TITLE);