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

Merge "Establish permanently unavailable settings"

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-09 18:14:32 +00:00
committed by Android (Google) Code Review
parent c0e0262f9c f87a1f3f41
commit 02ec86a17b
113 changed files with 185 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -17,10 +17,10 @@
package com.android.settings.slices;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
import static com.android.settings.core.BasePreferenceController.UNAVAILABLE_UNKNOWN;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
@@ -342,7 +342,7 @@ public class SliceBuilderUtils {
final IconCompat icon = IconCompat.createWithResource(context, data.getIconResource());
switch (controller.getAvailabilityStatus()) {
case DISABLED_UNSUPPORTED:
case UNSUPPORTED_ON_DEVICE:
summary = context.getString(R.string.unsupported_setting_summary);
primaryAction = new SliceAction(getSettingsIntent(context), icon, title);
break;
@@ -356,7 +356,7 @@ public class SliceBuilderUtils {
primaryAction = new SliceAction(getContentPendingIntent(context, data), icon,
title);
break;
case UNAVAILABLE_UNKNOWN:
case CONDITIONALLY_UNAVAILABLE:
default:
summary = context.getString(R.string.unknown_unavailability_setting_summary);
primaryAction = new SliceAction(getSettingsIntent(context), icon, title);