diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2852d6bcb46..b8106f96816 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1951,8 +1951,13 @@ android:screenOrientation="portrait"/> + android:exported="true" + android:screenOrientation="portrait"> + + + + + - startActivityForResult(HelpUtils.getHelpIntent(context, - context.getString(R.string.help_url_app_usage_settings), - /*backupContext=*/ ""), /*requestCode=*/ 0)); - mFooterPreference.setLearnMoreContentDescription( - context.getString(R.string.manager_battery_usage_link_a11y)); + final Intent helpIntent = HelpUtils.getHelpIntent(context, context.getString( + R.string.help_url_app_usage_settings), /*backupContext=*/ ""); + if (helpIntent != null) { + mFooterPreference.setLearnMoreAction(v -> + startActivityForResult(helpIntent, /*requestCode=*/ 0)); + mFooterPreference.setLearnMoreContentDescription( + context.getString(R.string.manager_battery_usage_link_a11y)); + } } @Override diff --git a/src/com/android/settings/fuelgauge/BatteryChartView.java b/src/com/android/settings/fuelgauge/BatteryChartView.java index 98cfdc8f825..ff61fcead5a 100644 --- a/src/com/android/settings/fuelgauge/BatteryChartView.java +++ b/src/com/android/settings/fuelgauge/BatteryChartView.java @@ -526,8 +526,9 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick ? mTrapezoidColor : mSelectedIndex == index || mSelectedIndex == SELECTED_INDEX_ALL ? mTrapezoidSolidColor : mTrapezoidColor; - final boolean isHover = mHoveredIndex == index && isValidToDraw(mHoveredIndex); - mTrapezoidPaint.setColor(isHover ? mTrapezoidHoverColor : trapezoidColor); + final boolean isHoverState = + mIsSlotsClickabled && mHoveredIndex == index && isValidToDraw(mHoveredIndex); + mTrapezoidPaint.setColor(isHoverState ? mTrapezoidHoverColor : trapezoidColor); final float leftTop = round(trapezoidBottom - mLevels[index] * unitHeight); final float rightTop = round(trapezoidBottom - mLevels[index + 1] * unitHeight); diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index 27b70cb6129..26c0ab9674f 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -24,6 +24,7 @@ import android.text.TextUtils; import androidx.preference.Preference; import androidx.preference.SwitchPreference; +import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -61,6 +62,11 @@ public class SmartBatteryPreferenceController extends BasePreferenceController i return true; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_battery; + } + @Override public void updateState(Preference preference) { super.updateState(preference); diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 1a7fa38be31..29791518bed 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -118,6 +118,11 @@ public class BatterySaverButtonPreferenceController extends false /* needFirstTimeWarning */); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_battery; + } + @Override public void onPowerSaveModeChanged() { mHandler.postDelayed(() -> onPowerSaveModeChangedInternal(), diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java index 6754245d712..ce2cbb0b548 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java @@ -8,6 +8,7 @@ import android.text.TextUtils; import androidx.preference.Preference; import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; @@ -59,4 +60,9 @@ public class BatterySaverStickyPreferenceController extends TogglePreferenceCont public int getAvailabilityStatus() { return AVAILABLE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_battery; + } } diff --git a/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java b/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java index 6ecf7b119f7..4c5e28c9d89 100644 --- a/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java +++ b/src/com/android/settings/gestures/ButtonNavigationSettingsAssistController.java @@ -22,6 +22,7 @@ import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVE import android.content.Context; import android.provider.Settings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; /** @@ -58,4 +59,9 @@ public class ButtonNavigationSettingsAssistController extends TogglePreferenceCo return UNSUPPORTED_ON_DEVICE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_system; + } } diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java b/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java index 95fd9f1fd61..159f4795815 100644 --- a/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java +++ b/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java @@ -19,6 +19,7 @@ package com.android.settings.gestures; import android.content.Context; import android.provider.Settings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; /** @@ -50,4 +51,9 @@ public class GestureNavigationSettingsAssistController extends TogglePreferenceC return SystemNavigationPreferenceController.isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_system; + } } diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index c771abdce22..71c3c9ac63c 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -78,6 +78,11 @@ public abstract class GesturePreferenceController extends TogglePreferenceContro } } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_system; + } + protected abstract String getVideoPrefKey(); protected boolean canHandleClicks() { diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index 76964e5e000..d82cb108f50 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -25,10 +25,13 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; +import java.util.List; + @SearchIndexable public class GestureSettings extends DashboardFragment { private static final String TAG = "GestureSettings"; + private static final String PREF_KEY_PREVENT_RINGING = "gesture_prevent_ringing_summary"; private AmbientDisplayConfiguration mAmbientDisplayConfig; @@ -63,5 +66,13 @@ public class GestureSettings extends DashboardFragment { } public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.gestures); + new BaseSearchIndexProvider(R.xml.gestures) { + @Override + public List getNonIndexableKeys(Context context) { + final List keys = super.getNonIndexableKeys(context); + // de-duplicated due to another same entry in Sound page + keys.add(PREF_KEY_PREVENT_RINGING); + return keys; + } + }; } diff --git a/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java b/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java index 44494eeced2..82766dba150 100644 --- a/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java +++ b/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java @@ -120,6 +120,11 @@ public class LongPressPowerButtonPreferenceController extends TogglePreferenceCo return false; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_system; + } + private void refreshStateDisplay() { if (mAssistSwitch != null) { mAssistSwitch.setSummary(getSummary()); diff --git a/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java b/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java index 2b7d7a0f307..3f84aba4f14 100644 --- a/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java +++ b/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java @@ -21,6 +21,7 @@ import android.net.Uri; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.widget.SettingsMainSwitchPreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; @@ -92,4 +93,9 @@ public class OneHandedMainSwitchPreferenceController extends mPreference.setChecked(isChecked()); } } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_system; + } } diff --git a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java index cb2fc072116..03b0259449c 100644 --- a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java @@ -137,6 +137,11 @@ public class PreventRingingParentPreferenceController extends TogglePreferenceCo return UNSUPPORTED_ON_DEVICE; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_sound; + } + @Override public void onStart() { if (mSettingObserver != null) { diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index 94d3f69ed2f..f10a2d74c9d 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -147,11 +147,17 @@ public class BatteryFixSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, PowerUsageSummary.class.getName(), BatteryTipPreferenceController.PREF_NAME, screenTitle, - SettingsEnums.SLICE) + SettingsEnums.SLICE, + this) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(contentUri); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_battery; + } + @Override public void onNotifyChange(Intent intent) { } diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java index bfdd13a3ad2..7e4730ca951 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java @@ -130,11 +130,17 @@ public class BluetoothDevicesSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, ConnectedDeviceDashboardFragment.class.getName(), "" /* key */, screenTitle, - SettingsEnums.SLICE) + SettingsEnums.SLICE, + this) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(getUri()); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_connected_devices; + } + @Override public void onNotifyChange(Intent intent) { final boolean enableBluetooth = intent.getBooleanExtra(EXTRA_ENABLE_BLUETOOTH, false); diff --git a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java index f11b0e3f8d2..2291bd736d5 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java @@ -117,8 +117,14 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable { final Uri contentUri = new Uri.Builder().appendPath(PREF_NAME).build(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, ScreenTimeoutSettings.class.getName(), PREF_NAME, screenTitle.toString(), - SettingsEnums.SLICE).setClassName(mContext.getPackageName(), - SubSettings.class.getName()).setData(contentUri); + SettingsEnums.SLICE, this) + .setClassName(mContext.getPackageName(), + SubSettings.class.getName()).setData(contentUri); + } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_display; } private PendingIntent getPrimaryAction() { diff --git a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java index f934d587eda..96924e40b3b 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java @@ -148,6 +148,11 @@ public class DarkThemeSlice implements CustomSliceable { return null; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_display; + } + @Override public Class getBackgroundWorkerClass() { return DarkThemeWorker.class; diff --git a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java index 1b3ee10b233..7cf7d869174 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java @@ -133,13 +133,18 @@ public class FaceSetupSlice implements CustomSliceable { SecuritySettings.class.getName(), FaceStatusPreferenceController.KEY_FACE_SETTINGS, mContext.getText(R.string.security_settings_face_settings_enroll).toString(), - SettingsEnums.SLICE) + SettingsEnums.SLICE, this) .setClassName(mContext.getPackageName(), SubSettings.class.getName()); } else { return new Intent(mContext, FaceReEnrollDialog.class); } } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_security; + } + private static RowBuilder buildRowBuilder(CharSequence title, CharSequence subTitle, IconCompat icon, Context context, Intent intent) { final SliceAction primarySliceAction = SliceAction.createDeeplink( diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index 3812534aaf0..22e34317702 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -109,11 +109,17 @@ public class LowStorageSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, StorageDashboardFragment.class.getName(), "" /* key */, screenTitle, - SettingsEnums.SLICE) + SettingsEnums.SLICE, + this) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(CustomSliceRegistry.LOW_STORAGE_SLICE_URI); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_storage; + } + private RowBuilder buildRowBuilder(CharSequence title, String summary, IconCompat icon) { final SliceAction primarySliceAction = SliceAction.createDeeplink( PendingIntent.getActivity(mContext, 0, getIntent(), PendingIntent.FLAG_IMMUTABLE), diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index 80f668069f1..751dac78c43 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java @@ -100,6 +100,11 @@ public class GameControllerPreferenceController extends TogglePreferenceControll Settings.System.VIBRATE_INPUT_DEVICES, isChecked ? 1 : 0); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_system; + } + @Override public void onInputDeviceAdded(int deviceId) { updateState(mPreference); diff --git a/src/com/android/settings/inputmethod/OWNERS b/src/com/android/settings/inputmethod/OWNERS index 556de5f978c..7c7d7928cfc 100644 --- a/src/com/android/settings/inputmethod/OWNERS +++ b/src/com/android/settings/inputmethod/OWNERS @@ -1,5 +1,6 @@ # Bug component: 34867 include platform/frameworks/base:/services/core/java/com/android/server/inputmethod/OWNERS +include /OWNERS # Settings for physical keyboard and game pad are better to be reviewed by the input team per-file GameControllerPreferenceController.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS diff --git a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java index 051fd8d8f1f..b491ec953a2 100644 --- a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java @@ -67,6 +67,11 @@ public class BluetoothScanningMainSwitchPreferenceController extends TogglePrefe return true; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_location; + } + @Override public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != isChecked()) { diff --git a/src/com/android/settings/location/LocationIndicatorsPreferenceController.java b/src/com/android/settings/location/LocationIndicatorsPreferenceController.java index d39c280f5a6..75ffb3a9286 100644 --- a/src/com/android/settings/location/LocationIndicatorsPreferenceController.java +++ b/src/com/android/settings/location/LocationIndicatorsPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.provider.DeviceConfig; +import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; @@ -54,4 +55,9 @@ public class LocationIndicatorsPreferenceController extends TogglePreferenceCont return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LOCATION) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_location; + } } diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java index f8add128e1e..291e5e455e8 100644 --- a/src/com/android/settings/location/LocationSlice.java +++ b/src/com/android/settings/location/LocationSlice.java @@ -88,11 +88,16 @@ public class LocationSlice implements CustomSliceable { final Uri contentUri = new Uri.Builder().appendPath(KEY_LOCATION).build(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, LocationSettings.class.getName(), KEY_LOCATION, screenTitle, - SettingsEnums.LOCATION) + SettingsEnums.LOCATION, this) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(contentUri); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_location; + } + private PendingIntent getPrimaryAction() { final Intent intent = getIntent(); return PendingIntent.getActivity(mContext, 0 /* requestCode */, diff --git a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java index a69fdb8890f..546f1e1e399 100644 --- a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java @@ -68,6 +68,11 @@ public class WifiScanningMainSwitchPreferenceController extends TogglePreference return true; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_location; + } + @Override public void onSwitchChanged(Switch switchView, boolean isChecked) { if (isChecked != isChecked()) { diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java index 10a8b792d56..e2232e71c2f 100644 --- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java +++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java @@ -92,6 +92,11 @@ public class MediaOutputIndicatorSlice implements CustomSliceable { return null; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_connected_devices; + } + @Override public Class getBackgroundWorkerClass() { return MediaOutputIndicatorWorker.class; diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java index 3d81c44b331..f856188c613 100644 --- a/src/com/android/settings/media/RemoteMediaSlice.java +++ b/src/com/android/settings/media/RemoteMediaSlice.java @@ -181,7 +181,9 @@ public class RemoteMediaSlice implements CustomSliceable { final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, SoundSettings.class.getName(), id, - mContext.getText(R.string.sound_settings).toString(), 0); + mContext.getText(R.string.sound_settings).toString(), + 0 /* sourceMetricsCategory */, + R.string.menu_key_sound); intent.setClassName(mContext.getPackageName(), SubSettings.class.getName()); intent.setData(contentUri); final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, @@ -221,6 +223,11 @@ public class RemoteMediaSlice implements CustomSliceable { return null; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_connected_devices; + } + @Override public Class getBackgroundWorkerClass() { return MediaDeviceUpdateWorker.class; diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java index e3d779ce938..ea849f65ac0 100644 --- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java +++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java @@ -22,6 +22,7 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.widget.SettingsMainSwitchPreferenceController; /** @@ -62,4 +63,9 @@ public class AdaptiveConnectivityTogglePreferenceController extends mWifiManager.setWifiScoringEnabled(isChecked); return true; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } } diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 68390379328..e74f3ae979e 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -120,6 +120,11 @@ public class AirplaneModePreferenceController extends TogglePreferenceController return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + @Override public void onStart() { if (isAvailable()) { diff --git a/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java b/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java index c5d8b973097..26679c67666 100644 --- a/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java +++ b/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java @@ -22,6 +22,7 @@ import androidx.lifecycle.Lifecycle; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; import com.android.settings.wifi.WifiPickerTrackerHelper; @@ -88,6 +89,11 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr updateCarrierNetworkPreference(); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + @Override public void onWifiStateChanged() { updateCarrierNetworkPreference(); diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java index 146b11ad265..0aae349e72f 100644 --- a/src/com/android/settings/network/ProviderModelSlice.java +++ b/src/com/android/settings/network/ProviderModelSlice.java @@ -290,7 +290,7 @@ public class ProviderModelSlice extends WifiSlice { final String screenTitle = mContext.getText(R.string.provider_internet_settings).toString(); return SliceBuilderUtils.buildSearchResultPageIntent(mContext, NetworkProviderSettings.class.getName(), "" /* key */, screenTitle, - SettingsEnums.SLICE) + SettingsEnums.SLICE, this) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(getUri()); } diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java index 822aa726fee..b1627f2ec22 100644 --- a/src/com/android/settings/network/TetherBasePreferenceController.java +++ b/src/com/android/settings/network/TetherBasePreferenceController.java @@ -25,6 +25,7 @@ import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.datausage.DataSaverBackend; @@ -117,6 +118,11 @@ public abstract class TetherBasePreferenceController extends TogglePreferenceCon return AVAILABLE; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + @Override public void onTetherStateUpdated(@TetherEnabler.TetheringState int state) { mTetheringState = state; diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java index 7ec31becb3f..22bb5818f9c 100644 --- a/src/com/android/settings/network/telephony/MobileDataSlice.java +++ b/src/com/android/settings/network/telephony/MobileDataSlice.java @@ -145,6 +145,11 @@ public class MobileDataSlice implements CustomSliceable { return new Intent(mContext, MobileNetworkActivity.class); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + @Override public Class getBackgroundWorkerClass() { return MobileDataWorker.class; diff --git a/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java b/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java index 7fe5f1d99d6..46f279db260 100644 --- a/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java +++ b/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java @@ -65,6 +65,12 @@ public abstract class TelephonyTogglePreferenceController extends TogglePreferen return false; } + @Override + public int getSliceHighlightMenuRes() { + // not needed since it's not sliceable + return 0; + } + /** * Get carrier config based on specific subscription id. * diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index b30e7c3fe5d..483fead807e 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -27,6 +27,7 @@ import android.widget.Switch; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.slices.SliceBackgroundWorker; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -58,7 +59,7 @@ public class NfcPreferenceController extends TogglePreferenceController return; } - mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey()); + mPreference = screen.findPreference(getPreferenceKey()); mPreference.addOnSwitchChangeListener(this); mNfcEnabler = new NfcEnabler(mContext, mPreference); } @@ -103,6 +104,11 @@ public class NfcPreferenceController extends TogglePreferenceController return true; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_connected_devices; + } + @Override public Class getBackgroundWorkerClass() { return NfcSliceWorker.class; diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java index 4e548d141b7..e1d27d0ba78 100644 --- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java +++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java @@ -21,6 +21,7 @@ import android.nfc.NfcAdapter; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; @@ -81,6 +82,11 @@ public class SecureNfcPreferenceController extends TogglePreferenceController return true; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_connected_devices; + } + @Override public void onResume() { if (mSecureNfcEnabler != null) { diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index 613204b9375..69d95a817c7 100644 --- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java @@ -30,6 +30,7 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -87,6 +88,11 @@ public class BadgingNotificationPreferenceController extends TogglePreferenceCon return TextUtils.equals(getPreferenceKey(), "notification_badging"); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_notifications; + } + @Override public boolean isChecked() { return Settings.Secure.getInt(mContext.getContentResolver(), diff --git a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java index 37723b13283..9e3566498b0 100644 --- a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java @@ -88,6 +88,12 @@ public class BubbleNotificationPreferenceController extends return false; } + @Override + public int getSliceHighlightMenuRes() { + // not needed since it's not sliceable + return 0; + } + @Override public boolean isChecked() { return Settings.Global.getInt(mContext.getContentResolver(), diff --git a/src/com/android/settings/notification/NotificationAssistantPreferenceController.java b/src/com/android/settings/notification/NotificationAssistantPreferenceController.java index bdbc478e740..91031c8e4de 100644 --- a/src/com/android/settings/notification/NotificationAssistantPreferenceController.java +++ b/src/com/android/settings/notification/NotificationAssistantPreferenceController.java @@ -24,6 +24,7 @@ import android.provider.Settings; import androidx.fragment.app.Fragment; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.google.common.annotations.VisibleForTesting; @@ -73,6 +74,11 @@ public class NotificationAssistantPreferenceController extends TogglePreferenceC } } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_notifications; + } + protected void setNotificationAssistantGranted(ComponentName cn) { if (Settings.Secure.getIntForUser(mContext.getContentResolver(), Settings.Secure.NAS_SETTINGS_UPDATED, 0, mUserId) == 0) { diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java index cf8801fdb83..1af8867acd5 100644 --- a/src/com/android/settings/notification/NotificationBackend.java +++ b/src/com/android/settings/notification/NotificationBackend.java @@ -20,6 +20,7 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED; import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC; import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER; +import static android.os.UserHandle.USER_SYSTEM; import android.app.INotificationManager; import android.app.NotificationChannel; @@ -44,6 +45,7 @@ import android.graphics.drawable.Drawable; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; +import android.provider.Settings; import android.service.notification.ConversationChannelWrapper; import android.service.notification.NotificationListenerFilter; import android.text.format.DateUtils; @@ -112,15 +114,25 @@ public class NotificationBackend { void recordCanBeBlocked(Context context, PackageManager pm, RoleManager rm, PackageInfo app, AppRow row) { - row.systemApp = Utils.isSystemPackage(context.getResources(), pm, app); - List roles = rm.getHeldRolesFromController(app.packageName); - if (roles.contains(RoleManager.ROLE_DIALER) - || roles.contains(RoleManager.ROLE_EMERGENCY)) { - row.systemApp = true; + if (Settings.Secure.getIntForUser(context.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 0, USER_SYSTEM) != 0) { + try { + row.systemApp = row.lockedImportance = + sINM.isPermissionFixed(app.packageName, row.userId); + } catch (RemoteException e) { + Log.w(TAG, "Error calling NMS", e); + } + } else { + row.systemApp = Utils.isSystemPackage(context.getResources(), pm, app); + List roles = rm.getHeldRolesFromController(app.packageName); + if (roles.contains(RoleManager.ROLE_DIALER) + || roles.contains(RoleManager.ROLE_EMERGENCY)) { + row.systemApp = true; + } + final String[] nonBlockablePkgs = context.getResources().getStringArray( + com.android.internal.R.array.config_nonBlockableNotificationPackages); + markAppRowWithBlockables(nonBlockablePkgs, row, app.packageName); } - final String[] nonBlockablePkgs = context.getResources().getStringArray( - com.android.internal.R.array.config_nonBlockableNotificationPackages); - markAppRowWithBlockables(nonBlockablePkgs, row, app.packageName); } @VisibleForTesting static void markAppRowWithBlockables(String[] nonBlockablePkgs, AppRow row, @@ -653,6 +665,11 @@ public class NotificationBackend { return false; } + @VisibleForTesting + void setNm(INotificationManager inm) { + sINM = inm; + } + /** * NotificationsSentState contains how often an app sends notifications and how recently it sent * one. diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index 78855208f79..ad53fc3a0a3 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java @@ -28,6 +28,7 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; @@ -86,6 +87,11 @@ public class PulseNotificationPreferenceController extends TogglePreferenceContr isChecked ? ON : OFF); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_notifications; + } + class SettingObserver extends ContentObserver { private final Uri NOTIFICATION_LIGHT_PULSE_URI = diff --git a/src/com/android/settings/notification/RedactNotificationPreferenceController.java b/src/com/android/settings/notification/RedactNotificationPreferenceController.java index d0326bb5c6a..db34e5e960a 100644 --- a/src/com/android/settings/notification/RedactNotificationPreferenceController.java +++ b/src/com/android/settings/notification/RedactNotificationPreferenceController.java @@ -32,6 +32,7 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; @@ -146,6 +147,11 @@ public class RedactNotificationPreferenceController extends TogglePreferenceCont return AVAILABLE; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_notifications; + } + @Override public void onStart() { mContext.getContentResolver().registerContentObserver( diff --git a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java index 0585382a798..4c4c99dcd1a 100644 --- a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java +++ b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.content.Context; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.google.common.annotations.VisibleForTesting; @@ -52,4 +53,9 @@ public class SilentStatusBarPreferenceController extends TogglePreferenceControl public int getAvailabilityStatus() { return AVAILABLE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_notifications; + } } diff --git a/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java b/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java index 03170e42e9d..2c89f743f57 100644 --- a/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java +++ b/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java @@ -21,10 +21,11 @@ import static android.provider.Settings.Secure.SHOW_NOTIFICATION_SNOOZE; import android.content.Context; import android.provider.Settings; -import com.android.settings.core.TogglePreferenceController; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; +import com.android.settings.core.TogglePreferenceController; + public class SnoozeNotificationPreferenceController extends TogglePreferenceController { private static final String TAG = "SnoozeNotifPrefContr"; @@ -53,4 +54,9 @@ public class SnoozeNotificationPreferenceController extends TogglePreferenceCont return Settings.Secure.putInt(mContext.getContentResolver(), SHOW_NOTIFICATION_SNOOZE, isChecked ? ON : OFF); } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_notifications; + } } diff --git a/src/com/android/settings/notification/SpatialAudioPreferenceController.java b/src/com/android/settings/notification/SpatialAudioPreferenceController.java index 14200765678..7bca516f1c3 100644 --- a/src/com/android/settings/notification/SpatialAudioPreferenceController.java +++ b/src/com/android/settings/notification/SpatialAudioPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.media.AudioManager; import android.media.Spatializer; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; /** @@ -53,4 +54,9 @@ public class SpatialAudioPreferenceController extends TogglePreferenceController mSpatializer.setEnabled(isChecked); return isChecked == isChecked(); } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_notifications; + } } diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index b32f922a51f..d1701599c34 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -23,6 +23,7 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.notification.VolumeSeekBarPreference.Callback; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -75,6 +76,11 @@ public abstract class VolumeSeekBarPreferenceController extends } } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_sound; + } + @Override public int getSliderPosition() { if (mPreference != null) { diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java index d5d516eaf73..f4e213298a7 100644 --- a/src/com/android/settings/notification/app/BlockPreferenceController.java +++ b/src/com/android/settings/notification/app/BlockPreferenceController.java @@ -80,7 +80,7 @@ public class BlockPreferenceController extends NotificationPreferenceController } bar.setDisabledByAdmin(mAdmin); - if (mChannel != null && !isChannelBlockable()) { + if (mChannel != null && (!isChannelBlockable() || !isChannelConfigurable(mChannel))) { bar.setSwitchBarEnabled(false); } @@ -88,8 +88,7 @@ public class BlockPreferenceController extends NotificationPreferenceController bar.setSwitchBarEnabled(false); } - if (mChannel == null && mAppRow.systemApp - && (!mAppRow.banned || mAppRow.lockedImportance)) { + if (mChannel == null && !isAppBlockable()) { bar.setSwitchBarEnabled(false); } diff --git a/src/com/android/settings/notification/app/ConversationPriorityPreferenceController.java b/src/com/android/settings/notification/app/ConversationPriorityPreferenceController.java index 9730104d303..ae169282484 100644 --- a/src/com/android/settings/notification/app/ConversationPriorityPreferenceController.java +++ b/src/com/android/settings/notification/app/ConversationPriorityPreferenceController.java @@ -62,9 +62,9 @@ public class ConversationPriorityPreferenceController extends NotificationPrefer public void updateState(Preference preference) { if (mAppRow != null) { - preference.setEnabled(mAdmin == null && !mChannel.isImportanceLockedByOEM()); + preference.setEnabled(mAdmin == null && isChannelConfigurable(mChannel)); ConversationPriorityPreference pref = (ConversationPriorityPreference) preference; - pref.setConfigurable(!mChannel.isImportanceLockedByOEM()); + pref.setConfigurable(isChannelConfigurable(mChannel)); pref.setImportance(mChannel.getImportance()); pref.setOriginalImportance(mChannel.getOriginalImportance()); pref.setPriorityConversation(mChannel.isImportantConversation()); diff --git a/src/com/android/settings/notification/app/HighImportancePreferenceController.java b/src/com/android/settings/notification/app/HighImportancePreferenceController.java index 67fb2ff1be5..d60668b9abe 100644 --- a/src/com/android/settings/notification/app/HighImportancePreferenceController.java +++ b/src/com/android/settings/notification/app/HighImportancePreferenceController.java @@ -68,7 +68,7 @@ public class HighImportancePreferenceController extends NotificationPreferenceCo @Override public void updateState(Preference preference) { if (mAppRow != null && mChannel != null) { - preference.setEnabled(mAdmin == null && !mChannel.isImportanceLockedByOEM()); + preference.setEnabled(mAdmin == null && isChannelConfigurable(mChannel)); RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference; pref.setChecked(mChannel.getImportance() >= IMPORTANCE_HIGH); diff --git a/src/com/android/settings/notification/app/ImportancePreferenceController.java b/src/com/android/settings/notification/app/ImportancePreferenceController.java index ed3410c1459..3c32ca4b0bc 100644 --- a/src/com/android/settings/notification/app/ImportancePreferenceController.java +++ b/src/com/android/settings/notification/app/ImportancePreferenceController.java @@ -66,9 +66,9 @@ public class ImportancePreferenceController extends NotificationPreferenceContro @Override public void updateState(Preference preference) { if (mAppRow!= null && mChannel != null) { - preference.setEnabled(mAdmin == null && !mChannel.isImportanceLockedByOEM()); + preference.setEnabled(mAdmin == null && isChannelConfigurable(mChannel)); ImportancePreference pref = (ImportancePreference) preference; - pref.setConfigurable(!mChannel.isImportanceLockedByOEM()); + pref.setConfigurable(isChannelConfigurable(mChannel)); pref.setImportance(mChannel.getImportance()); pref.setDisplayInStatusBar(mBackend.showSilentInStatusBar(mContext.getPackageName())); pref.setDisplayOnLockscreen(Settings.Secure.getInt(mContext.getContentResolver(), diff --git a/src/com/android/settings/notification/app/MinImportancePreferenceController.java b/src/com/android/settings/notification/app/MinImportancePreferenceController.java index 90f56b295d3..f8257636615 100644 --- a/src/com/android/settings/notification/app/MinImportancePreferenceController.java +++ b/src/com/android/settings/notification/app/MinImportancePreferenceController.java @@ -68,7 +68,7 @@ public class MinImportancePreferenceController extends NotificationPreferenceCon @Override public void updateState(Preference preference) { if (mAppRow != null && mChannel != null) { - preference.setEnabled(mAdmin == null && !mChannel.isImportanceLockedByOEM()); + preference.setEnabled(mAdmin == null && isChannelConfigurable(mChannel)); RestrictedSwitchPreference pref = (RestrictedSwitchPreference) preference; pref.setChecked(mChannel.getImportance() == IMPORTANCE_MIN); diff --git a/src/com/android/settings/notification/app/NotificationPreferenceController.java b/src/com/android/settings/notification/app/NotificationPreferenceController.java index e2eb453a780..289f1edfc3c 100644 --- a/src/com/android/settings/notification/app/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/app/NotificationPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification.app; import static android.app.NotificationManager.IMPORTANCE_NONE; +import static android.os.UserHandle.USER_SYSTEM; import android.annotation.Nullable; import android.app.NotificationChannel; @@ -27,6 +28,7 @@ import android.content.pm.PackageManager; import android.content.pm.ShortcutInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; +import android.provider.Settings; import android.util.Log; import androidx.preference.Preference; @@ -62,6 +64,12 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc @Nullable protected ShortcutInfo mConversationInfo; protected List mPreferenceFilter; + boolean mMigratedPermission; + + boolean overrideCanBlock; + boolean overrideCanConfigure; + boolean overrideCanBlockValue; + boolean overrideCanConfigureValue; public NotificationPreferenceController(Context context, NotificationBackend backend) { super(context); @@ -70,6 +78,8 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc mBackend = backend; mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE); mPm = mContext.getPackageManager(); + mMigratedPermission = Settings.Secure.getIntForUser(context.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 0, USER_SYSTEM) != 0; } /** @@ -138,10 +148,18 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc } protected boolean isChannelBlockable(NotificationChannel channel) { + if (overrideCanBlock) { + return overrideCanBlockValue; + } + if (overrideCanConfigure) { + return overrideCanConfigureValue; + } if (channel != null && mAppRow != null) { - if (channel.isImportanceLockedByCriticalDeviceFunction() - || channel.isImportanceLockedByOEM()) { - return channel.getImportance() == IMPORTANCE_NONE; + boolean locked = mMigratedPermission ? mAppRow.lockedImportance + : channel.isImportanceLockedByCriticalDeviceFunction() + || channel.isImportanceLockedByOEM(); + if (locked) { + return channel.isBlockable() || channel.getImportance() == IMPORTANCE_NONE; } return channel.isBlockable() || !mAppRow.systemApp @@ -150,9 +168,27 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc return false; } + protected boolean isAppBlockable() { + if (overrideCanBlock) { + return overrideCanBlockValue; + } + if (overrideCanConfigure) { + return overrideCanConfigureValue; + } + if (mAppRow != null) { + return !mAppRow.systemApp && !mAppRow.lockedImportance; + } + return true; + } + protected boolean isChannelConfigurable(NotificationChannel channel) { + if (overrideCanConfigure) { + return overrideCanConfigureValue; + } if (channel != null && mAppRow != null) { - return !channel.isImportanceLockedByOEM(); + boolean locked = mMigratedPermission ? mAppRow.lockedImportance + : channel.isImportanceLockedByOEM(); + return !locked || channel.isBlockable(); } return false; } @@ -162,8 +198,14 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc } protected boolean isChannelGroupBlockable(NotificationChannelGroup group) { + if (overrideCanBlock) { + return overrideCanBlockValue; + } + if (overrideCanConfigure) { + return overrideCanConfigureValue; + } if (group != null && mAppRow != null) { - if (!mAppRow.systemApp) { + if (!mAppRow.systemApp && !mAppRow.lockedImportance) { return true; } @@ -183,6 +225,16 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc return Objects.equals(NotificationChannel.DEFAULT_CHANNEL_ID, mChannel.getId()); } + protected final void setOverrideCanBlock(boolean canBlock) { + overrideCanBlock = true; + overrideCanBlockValue = canBlock; + } + + protected final void setOverrideCanConfigure(boolean canConfigure) { + overrideCanConfigure = true; + overrideCanConfigureValue = canConfigure; + } + public static final Comparator CHANNEL_GROUP_COMPARATOR = new Comparator() { @Override diff --git a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java index 5ea01eafe5a..1f553a26e94 100644 --- a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java @@ -120,7 +120,7 @@ public class ZenModeSliceBuilder { final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString(); return SliceBuilderUtils.buildSearchResultPageIntent(context, ZenModeSettings.class.getName(), ZEN_MODE_SLICE_KEY, screenTitle, - SettingsEnums.NOTIFICATION_ZEN_MODE) + SettingsEnums.NOTIFICATION_ZEN_MODE, R.string.menu_key_notifications) .setClassName(context.getPackageName(), SubSettings.class.getName()) .setData(contentUri); } diff --git a/src/com/android/settings/panel/NfcPanel.java b/src/com/android/settings/panel/NfcPanel.java index c1e15e84063..6b1e43525b4 100644 --- a/src/com/android/settings/panel/NfcPanel.java +++ b/src/com/android/settings/panel/NfcPanel.java @@ -62,7 +62,8 @@ public class NfcPanel implements PanelContent { AdvancedConnectedDeviceDashboardFragment.class.getName(), null /* key */, screenTitle, - SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY); + SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY, + R.string.menu_key_connected_devices); intent.setClassName(mContext.getPackageName(), SubSettings.class.getName()); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); return intent; diff --git a/src/com/android/settings/panel/WifiPanel.java b/src/com/android/settings/panel/WifiPanel.java index 3b36a57b397..95ebb336747 100644 --- a/src/com/android/settings/panel/WifiPanel.java +++ b/src/com/android/settings/panel/WifiPanel.java @@ -62,10 +62,11 @@ public class WifiPanel implements PanelContent { final String screenTitle = mContext.getText(R.string.wifi_settings).toString(); final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, - WifiSettings.class.getName(), - null /* key */, - screenTitle, - SettingsEnums.WIFI); + WifiSettings.class.getName(), + null /* key */, + screenTitle, + SettingsEnums.WIFI, + R.string.menu_key_network); intent.setClassName(mContext.getPackageName(), SubSettings.class.getName()); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); return intent; diff --git a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java index 47610aa18b5..3cf72b23dcc 100644 --- a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java +++ b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.privacy; import android.annotation.NonNull; import android.content.Context; -import android.provider.Settings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.utils.ContentCaptureUtils; @@ -46,4 +46,9 @@ public final class EnableContentCapturePreferenceController extends TogglePrefer && ContentCaptureUtils.getServiceSettingsComponentName() == null; return available ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_privacy; + } } diff --git a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java index 77aab34c9c3..c3878d51b62 100644 --- a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java +++ b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java @@ -28,8 +28,8 @@ import android.util.Log; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.dashboard.profileselector.UserAdapter; import com.android.settings.utils.ContentCaptureUtils; @@ -88,6 +88,11 @@ public final class EnableContentCaptureWithServiceSettingsPreferenceController return available ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_privacy; + } + private static final class ProfileSelectDialog { public static void show(Context context, Preference pref) { final UserManager userManager = UserManager.get(context); diff --git a/src/com/android/settings/privacy/SensorToggleController.java b/src/com/android/settings/privacy/SensorToggleController.java index 50b023b2eb8..53b1a2f65e0 100644 --- a/src/com/android/settings/privacy/SensorToggleController.java +++ b/src/com/android/settings/privacy/SensorToggleController.java @@ -22,6 +22,7 @@ import android.content.Context; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.utils.SensorPrivacyManagerHelper; import com.android.settingslib.RestrictedLockUtilsInternal; @@ -80,4 +81,9 @@ public abstract class SensorToggleController extends TogglePreferenceController (sensor, blocked) -> updateState(screen.findPreference(mPreferenceKey)), mCallbackExecutor); } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_privacy; + } } diff --git a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java index cf05ff48cc6..ad57073dbcf 100644 --- a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java +++ b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java @@ -27,6 +27,7 @@ import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; /** @@ -72,6 +73,11 @@ public class ShowClipAccessNotificationPreferenceController mPreference = screen.findPreference(getPreferenceKey()); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_privacy; + } + /** * Registers a DeviceConfig listener on start. */ diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java index 472101bfc55..696854a3ce5 100644 --- a/src/com/android/settings/security/ShowPasswordPreferenceController.java +++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java @@ -58,5 +58,9 @@ public class ShowPasswordPreferenceController extends TogglePreferenceController ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_security; + } } diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java index 64ca8537b56..9e82e78ede3 100644 --- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java +++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java @@ -28,6 +28,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; +import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; @@ -118,6 +119,11 @@ public class VisiblePatternProfilePreferenceController extends TogglePreferenceC mPreference = screen.findPreference(getPreferenceKey()); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_security; + } + @Override public void onResume() { mPreference.setVisible(isAvailable()); diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java index d06ad1e89f0..2c807c4ef91 100644 --- a/src/com/android/settings/slices/CustomSliceable.java +++ b/src/com/android/settings/slices/CustomSliceable.java @@ -103,6 +103,9 @@ public interface CustomSliceable extends Sliceable { return true; } + @Override + int getSliceHighlightMenuRes(); + /** * Build an instance of a {@link CustomSliceable} which has a {@link Context}-only constructor. */ diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index 2957df21bd5..4cefa4e430a 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -16,6 +16,8 @@ package com.android.settings.slices; +import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY; + import static com.android.settings.SettingsActivity.EXTRA_IS_FROM_SLICE; import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; @@ -203,8 +205,15 @@ public class SliceBuilderUtils { } public static Intent buildSearchResultPageIntent(Context context, String className, String key, - String screenTitle, int sourceMetricsCategory) { + String screenTitle, int sourceMetricsCategory, int highlightMenuRes) { final Bundle args = new Bundle(); + String highlightMenuKey = null; + if (highlightMenuRes != 0) { + highlightMenuKey = context.getString(highlightMenuRes); + if (TextUtils.isEmpty(highlightMenuKey)) { + Log.w(TAG, "Invalid menu key res from: " + screenTitle); + } + } args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key); final Intent searchDestination = new SubSettingLauncher(context) .setDestination(className) @@ -215,6 +224,7 @@ public class SliceBuilderUtils { searchDestination .putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key) .putExtra(EXTRA_IS_FROM_SLICE, true) + .putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY, highlightMenuKey) .setAction("com.android.settings.SEARCH_RESULT_TRAMPOLINE") .setComponent(null); searchDestination.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); @@ -222,13 +232,22 @@ public class SliceBuilderUtils { return searchDestination; } + /** + * Build a search result page intent for {@link CustomSliceable} + */ + public static Intent buildSearchResultPageIntent(Context context, String className, String key, + String screenTitle, int sourceMetricsCategory, CustomSliceable sliceable) { + return buildSearchResultPageIntent(context, className, key, screenTitle, + sourceMetricsCategory, sliceable.getSliceHighlightMenuRes()); + } + public static Intent getContentIntent(Context context, SliceData sliceData) { final Uri contentUri = new Uri.Builder().appendPath(sliceData.getKey()).build(); final String screenTitle = TextUtils.isEmpty(sliceData.getScreenTitle()) ? null : sliceData.getScreenTitle().toString(); final Intent intent = buildSearchResultPageIntent(context, sliceData.getFragmentClassName(), sliceData.getKey(), - screenTitle, 0 /* TODO */); + screenTitle, 0 /* TODO */, sliceData.getHighlightMenuRes()); intent.setClassName(context.getPackageName(), SubSettings.class.getName()); intent.setData(contentUri); return intent; diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java index 60f5e3fb840..01b29b23ce5 100644 --- a/src/com/android/settings/slices/SliceData.java +++ b/src/com/android/settings/slices/SliceData.java @@ -19,6 +19,7 @@ package com.android.settings.slices; import android.annotation.IntDef; import android.net.Uri; import android.text.TextUtils; +import android.util.Log; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -50,6 +51,8 @@ public class SliceData { int SLIDER = 2; } + private static final String TAG = "SliceData"; + private final String mKey; private final String mTitle; @@ -68,6 +71,8 @@ public class SliceData { private final String mPreferenceController; + private final int mHighlightMenuRes; + @SliceType private final int mSliceType; @@ -119,6 +124,10 @@ public class SliceData { return mUnavailableSliceSubtitle; } + public int getHighlightMenuRes() { + return mHighlightMenuRes; + } + public boolean isPublicSlice() { return mIsPublicSlice; } @@ -136,6 +145,7 @@ public class SliceData { mSliceType = builder.mSliceType; mUnavailableSliceSubtitle = builder.mUnavailableSliceSubtitle; mIsPublicSlice = builder.mIsPublicSlice; + mHighlightMenuRes = builder.mHighlightMenuRes; } @Override @@ -175,6 +185,8 @@ public class SliceData { private String mUnavailableSliceSubtitle; + private int mHighlightMenuRes; + private boolean mIsPublicSlice; public Builder setKey(String key) { @@ -233,6 +245,11 @@ public class SliceData { return this; } + public Builder setHighlightMenuRes(int highlightMenuRes) { + mHighlightMenuRes = highlightMenuRes; + return this; + } + public Builder setIsPublicSlice(boolean isPublicSlice) { mIsPublicSlice = isPublicSlice; return this; @@ -255,6 +272,10 @@ public class SliceData { throw new InvalidSliceDataException("Preference Controller cannot be empty"); } + if (mHighlightMenuRes == 0) { + Log.w(TAG, "Highlight menu key res is empty: " + mPrefControllerClassName); + } + return new SliceData(this); } diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java index 5608169a4db..eb08c5f978a 100644 --- a/src/com/android/settings/slices/SliceDataConverter.java +++ b/src/com/android/settings/slices/SliceDataConverter.java @@ -213,6 +213,7 @@ class SliceDataConverter { final String unavailableSliceSubtitle = bundle.getString( METADATA_UNAVAILABLE_SLICE_SUBTITLE); final boolean isPublicSlice = controller.isPublicSlice(); + final int highlightMenuRes = controller.getSliceHighlightMenuRes(); final SliceData xmlSlice = new SliceData.Builder() .setKey(key) @@ -226,6 +227,7 @@ class SliceDataConverter { .setSliceType(sliceType) .setUnavailableSliceSubtitle(unavailableSliceSubtitle) .setIsPublicSlice(isPublicSlice) + .setHighlightMenuRes(highlightMenuRes) .build(); xmlSliceData.add(xmlSlice); diff --git a/src/com/android/settings/slices/Sliceable.java b/src/com/android/settings/slices/Sliceable.java index ad27b7c0496..31555df0022 100644 --- a/src/com/android/settings/slices/Sliceable.java +++ b/src/com/android/settings/slices/Sliceable.java @@ -50,6 +50,8 @@ public interface Sliceable { * - Must be understandable as a stand-alone Setting. *

* This does not guarantee the setting is available. + *

+ * {@link #getSliceHighlightMenuRes} should also be overridden when returning true. * * @return {@code true} if the controller should be used as a Slice. */ @@ -131,4 +133,12 @@ public interface Sliceable { default Class getBackgroundWorkerClass() { return null; } + + /** + * @return a resource ID that indicates which menu entry should be highlighted in multi-pane + * mode. + */ + default int getSliceHighlightMenuRes() { + return 0; + } } diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index c0bb8de63da..75f0220f7ba 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -50,6 +50,7 @@ public class SlicesDatabaseAccessor { IndexColumns.CONTROLLER, IndexColumns.SLICE_TYPE, IndexColumns.UNAVAILABLE_SLICE_SUBTITLE, + IndexColumns.HIGHLIGHT_MENU_RESOURCE, }; private final Context mContext; @@ -163,6 +164,8 @@ public class SlicesDatabaseAccessor { cursor.getColumnIndex(IndexColumns.SLICE_TYPE)); final String unavailableSliceSubtitle = cursor.getString( cursor.getColumnIndex(IndexColumns.UNAVAILABLE_SLICE_SUBTITLE)); + final int highlightMenuRes = cursor.getInt( + cursor.getColumnIndex(IndexColumns.HIGHLIGHT_MENU_RESOURCE)); if (isIntentOnly) { sliceType = SliceData.SliceType.INTENT; @@ -180,6 +183,7 @@ public class SlicesDatabaseAccessor { .setUri(uri) .setSliceType(sliceType) .setUnavailableSliceSubtitle(unavailableSliceSubtitle) + .setHighlightMenuRes(highlightMenuRes) .build(); } diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java index fe4420b26b0..69ad702913c 100644 --- a/src/com/android/settings/slices/SlicesDatabaseHelper.java +++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java @@ -36,7 +36,7 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper { private static final String DATABASE_NAME = "slices_index.db"; private static final String SHARED_PREFS_TAG = "slices_shared_prefs"; - private static final int DATABASE_VERSION = 8; + private static final int DATABASE_VERSION = 9; public interface Tables { String TABLE_SLICES_INDEX = "slices_index"; @@ -103,39 +103,43 @@ public class SlicesDatabaseHelper extends SQLiteOpenHelper { * Whether the slice should be exposed publicly. */ String PUBLIC_SLICE = "public_slice"; + + /** + * Resource ID for the menu entry of the setting. + */ + String HIGHLIGHT_MENU_RESOURCE = "highlight_menu"; } private static final String CREATE_SLICES_TABLE = - "CREATE VIRTUAL TABLE " + Tables.TABLE_SLICES_INDEX + " USING fts4" + - "(" + - IndexColumns.KEY + - ", " + - IndexColumns.SLICE_URI + - ", " + - IndexColumns.TITLE + - ", " + - IndexColumns.SUMMARY + - ", " + - IndexColumns.SCREENTITLE + - ", " + - IndexColumns.KEYWORDS + - ", " + - IndexColumns.ICON_RESOURCE + - ", " + - IndexColumns.FRAGMENT + - ", " + - IndexColumns.CONTROLLER + - ", " + - IndexColumns.SLICE_TYPE + - ", " + - IndexColumns.UNAVAILABLE_SLICE_SUBTITLE + - ", " - + - IndexColumns.PUBLIC_SLICE - + - " INTEGER DEFAULT 0 " - + - ");"; + "CREATE VIRTUAL TABLE " + Tables.TABLE_SLICES_INDEX + " USING fts4" + + "(" + + IndexColumns.KEY + + ", " + + IndexColumns.SLICE_URI + + ", " + + IndexColumns.TITLE + + ", " + + IndexColumns.SUMMARY + + ", " + + IndexColumns.SCREENTITLE + + ", " + + IndexColumns.KEYWORDS + + ", " + + IndexColumns.ICON_RESOURCE + + ", " + + IndexColumns.FRAGMENT + + ", " + + IndexColumns.CONTROLLER + + ", " + + IndexColumns.SLICE_TYPE + + ", " + + IndexColumns.UNAVAILABLE_SLICE_SUBTITLE + + ", " + + IndexColumns.PUBLIC_SLICE + + ", " + + IndexColumns.HIGHLIGHT_MENU_RESOURCE + + " INTEGER DEFAULT 0 " + + ");"; private final Context mContext; diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index e527fd657ab..ac30c6c0a41 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -116,6 +116,7 @@ class SlicesIndexer implements Runnable { values.put(IndexColumns.UNAVAILABLE_SLICE_SUBTITLE, dataRow.getUnavailableSliceSubtitle()); values.put(IndexColumns.PUBLIC_SLICE, dataRow.isPublicSlice()); + values.put(IndexColumns.HIGHLIGHT_MENU_RESOURCE, dataRow.getHighlightMenuRes()); database.replaceOrThrow(Tables.TABLE_SLICES_INDEX, null /* nullColumnHack */, values); diff --git a/src/com/android/settings/sound/MediaControlsPreferenceController.java b/src/com/android/settings/sound/MediaControlsPreferenceController.java index ad09e2a6bee..e180b34fe34 100644 --- a/src/com/android/settings/sound/MediaControlsPreferenceController.java +++ b/src/com/android/settings/sound/MediaControlsPreferenceController.java @@ -23,6 +23,7 @@ import android.provider.Settings; import androidx.annotation.VisibleForTesting; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; /** @@ -50,4 +51,9 @@ public class MediaControlsPreferenceController extends TogglePreferenceControlle public int getAvailabilityStatus() { return AVAILABLE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_sound; + } } diff --git a/src/com/android/settings/sound/MediaControlsRecommendationController.java b/src/com/android/settings/sound/MediaControlsRecommendationController.java index 682cb5bc1e6..842a1417a15 100644 --- a/src/com/android/settings/sound/MediaControlsRecommendationController.java +++ b/src/com/android/settings/sound/MediaControlsRecommendationController.java @@ -21,6 +21,7 @@ import static android.provider.Settings.Secure.MEDIA_CONTROLS_RECOMMENDATION; import android.content.Context; import android.provider.Settings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; /** @@ -50,4 +51,9 @@ public class MediaControlsRecommendationController extends TogglePreferenceContr public int getAvailabilityStatus() { return AVAILABLE; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_sound; + } } diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java index f931fa4f662..ce5533e5c64 100644 --- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java @@ -20,6 +20,7 @@ import android.provider.Settings; import androidx.preference.Preference; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.RestrictedSwitchPreference; @@ -69,4 +70,9 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr return Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ADD_USERS_WHEN_LOCKED, isChecked ? 1 : 0); } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_system; + } } diff --git a/src/com/android/settings/uwb/UwbPreferenceController.java b/src/com/android/settings/uwb/UwbPreferenceController.java index 8b330a9422f..ad040ed6043 100644 --- a/src/com/android/settings/uwb/UwbPreferenceController.java +++ b/src/com/android/settings/uwb/UwbPreferenceController.java @@ -162,5 +162,10 @@ public class UwbPreferenceController extends TogglePreferenceController implemen return mContext.getResources().getString(R.string.uwb_settings_summary); } } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_connected_devices; + } } diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java index eab50a62e45..59ad44088ec 100644 --- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java +++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java @@ -22,6 +22,7 @@ import android.provider.Settings; import android.telephony.SubscriptionManager; import com.android.internal.annotations.VisibleForTesting; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; /** @@ -51,6 +52,11 @@ public class CellularFallbackPreferenceController extends TogglePreferenceContro Settings.Global.NETWORK_AVOID_BAD_WIFI, isChecked ? "1" : null); } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + private boolean avoidBadWifiConfig() { final int activeDataSubscriptionId = getActiveDataSubscriptionId(); if (activeDataSubscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index 6455f5b97cc..4b7506d4606 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -26,6 +26,7 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -85,6 +86,11 @@ public class NotifyOpenNetworksPreferenceController extends TogglePreferenceCont return true; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + class SettingObserver extends ContentObserver { private final Uri NETWORKS_AVAILABLE_URI = Settings.Global.getUriFor( Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON); diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index e9fd35004da..2cc7f8ef5d9 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -135,6 +135,11 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i } } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + @VisibleForTesting CharSequence getNoLocationSummary() { AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo("link", null); diff --git a/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java index ffbb68289b5..8226bc07848 100644 --- a/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.details2; import android.content.Context; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.wifitrackerlib.WifiEntry; @@ -54,4 +55,9 @@ public class WifiAutoConnectPreferenceController2 extends TogglePreferenceContro mWifiEntry.setAutoJoinEnabled(isChecked); return true; } + + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } } diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java index f6604dd6f6e..29a2bd6cb32 100644 --- a/src/com/android/settings/wifi/slice/WifiSlice.java +++ b/src/com/android/settings/wifi/slice/WifiSlice.java @@ -33,6 +33,7 @@ import android.net.Uri; import android.net.wifi.WifiManager; import android.os.Bundle; import android.text.TextUtils; +import android.util.FeatureFlagUtils; import androidx.annotation.VisibleForTesting; import androidx.core.graphics.drawable.IconCompat; @@ -44,6 +45,8 @@ import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; +import com.android.settings.network.NetworkProviderSettings; +import com.android.settings.network.WifiSwitchPreferenceController; import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.SliceBackgroundWorker; import com.android.settings.slices.SliceBuilderUtils; @@ -269,15 +272,28 @@ public class WifiSlice implements CustomSliceable { public Intent getIntent() { final String screenTitle = mContext.getText(R.string.wifi_settings).toString(); final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build(); - final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, - WifiSettings.class.getName(), KEY_WIFI, screenTitle, - SettingsEnums.DIALOG_WIFI_AP_EDIT) + final String className; + final String key; + if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) { + className = NetworkProviderSettings.class.getName(); + key = WifiSwitchPreferenceController.KEY; + } else { + className = WifiSettings.class.getName(); + key = KEY_WIFI; + } + final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, className, + key, screenTitle, SettingsEnums.DIALOG_WIFI_AP_EDIT, this) .setClassName(mContext.getPackageName(), SubSettings.class.getName()) .setData(contentUri); return intent; } + @Override + public int getSliceHighlightMenuRes() { + return R.string.menu_key_network; + } + private boolean isWifiEnabled() { switch (mWifiManager.getWifiState()) { case WifiManager.WIFI_STATE_ENABLED: diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java index 17471b5d90c..063be35fe77 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java @@ -16,6 +16,9 @@ package com.android.settings.notification; +import static android.os.UserHandle.USER_SYSTEM; +import static android.provider.Settings.*; + import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertFalse; @@ -24,6 +27,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.app.INotificationManager; import android.app.role.RoleManager; import android.app.usage.UsageEvents; import android.bluetooth.BluetoothAdapter; @@ -33,6 +37,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Parcel; +import android.provider.Settings; import com.android.settings.notification.NotificationBackend.AppRow; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -63,11 +68,16 @@ public class NotificationBackendTest { @Mock CachedBluetoothDeviceManager mCbm; ComponentName mCn = new ComponentName("a", "b"); + @Mock + INotificationManager mInm; + NotificationBackend mNotificationBackend; @Before public void setUp() { MockitoAnnotations.initMocks(this); when(mBm.getCachedDeviceManager()).thenReturn(mCbm); + mNotificationBackend = new NotificationBackend(); + mNotificationBackend.setNm(mInm); } @Test @@ -101,6 +111,46 @@ public class NotificationBackendTest { assertTrue(appRow.systemApp); } + @Test + public void testMarkAppRow_fixedPermission() throws Exception { + Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + PackageInfo pi = new PackageInfo(); + pi.packageName = "test"; + pi.applicationInfo = new ApplicationInfo(); + pi.applicationInfo.packageName = "test"; + pi.applicationInfo.uid = 123; + + when(mInm.isPermissionFixed(pi.packageName, 0)).thenReturn(true); + + AppRow appRow = new NotificationBackend().loadAppRow(RuntimeEnvironment.application, + mock(PackageManager.class), mock(RoleManager.class), pi); + + assertTrue(appRow.systemApp); + assertTrue(appRow.lockedImportance); + } + + @Test + public void testMarkAppRow_notFixedPermission() throws Exception { + Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + PackageInfo pi = new PackageInfo(); + pi.packageName = "test"; + pi.applicationInfo = new ApplicationInfo(); + pi.applicationInfo.packageName = "test"; + pi.applicationInfo.uid = 123; + + when(mInm.isPermissionFixed(pi.packageName, 0)).thenReturn(false); + + AppRow appRow = new NotificationBackend().loadAppRow(RuntimeEnvironment.application, + mock(PackageManager.class), mock(RoleManager.class), pi); + + assertFalse(appRow.systemApp); + assertFalse(appRow.lockedImportance); + } + @Test public void testMarkAppRow_notDefaultPackage() { PackageInfo pi = new PackageInfo(); diff --git a/tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java index be663d8f8c8..5260ff64c1d 100644 --- a/tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java @@ -165,20 +165,6 @@ public class AllowSoundPreferenceControllerTest { assertFalse(pref.isEnabled()); } - @Test - public void testUpdateState_notBlockable_oem() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.getId()).thenReturn(""); - when(channel.isImportanceLockedByOEM()).thenReturn(true); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new RestrictedSwitchPreference(mContext); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - @Test public void testUpdateState_configurable() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); diff --git a/tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java index 9cdf64dc79d..d8717764111 100644 --- a/tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java @@ -217,20 +217,6 @@ public class BadgePreferenceControllerTest { assertFalse(pref.isEnabled()); } - @Test - public void testUpdateState_channelNotBlockable() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.getId()).thenReturn(""); - when(channel.isImportanceLockedByOEM()).thenReturn(true); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new RestrictedSwitchPreference(mContext); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - @Test public void testUpdateState_channel() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); diff --git a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java index d65f91dd0b1..0c2eebe8070 100644 --- a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java @@ -200,68 +200,40 @@ public class BlockPreferenceControllerTest { } @Test - public void testIsEnabled_lockedApp() { + public void testIsEnabled_cannotBlockAppOrGroupOrChannel() { + mController.setOverrideCanBlock(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.lockedImportance = true; - appRow.systemApp = true; mController.onResume(appRow, null, null, null, null, null, null); mController.updateState(mPreference); assertFalse(mPreference.getSwitchBar().isEnabled()); } @Test - public void testIsEnabled_GroupNotBlockable() { + public void testIsEnabled_importanceLocked_app() { + mController.setOverrideCanConfigure(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; - mController.onResume(appRow, null, mock(NotificationChannelGroup.class), null, null, null, - null); - mController.updateState(mPreference); - assertFalse(mPreference.getSwitchBar().isEnabled()); - } - - @Test - public void testIsEnabled_systemAppNotBlockable() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; mController.onResume(appRow, null, null, null, null, null, null); mController.updateState(mPreference); assertFalse(mPreference.getSwitchBar().isEnabled()); } @Test - public void testIsEnabled_systemAppBlockable() { + public void testIsEnabled_importanceLocked_group() { + mController.setOverrideCanConfigure(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; - NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT); - channel.setBlockable(true); - mController.onResume(appRow, channel, null, null, null, null, null); + mController.onResume( + appRow, null, new NotificationChannelGroup("a", "a"), null, null, null, null); mController.updateState(mPreference); - assertTrue(mPreference.getSwitchBar().isEnabled()); - } - - @Test - public void testIsEnabled_lockedChannel() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); - when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); - mController.onResume(appRow, channel, null, null, null, null, null); - - mController.updateState(mPreference); - assertFalse(mPreference.getSwitchBar().isEnabled()); } @Test - public void testIsEnabled_defaultAppChannel() { + public void testIsEnabled_importanceLocked_channel() { + mController.setOverrideCanConfigure(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); - when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); - mController.onResume(appRow, channel, null, null, null, null, null); - + mController.onResume(appRow, new NotificationChannel("a", "a", IMPORTANCE_LOW), null, null, + null, null, null); mController.updateState(mPreference); - assertFalse(mPreference.getSwitchBar().isEnabled()); } diff --git a/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java index e04402cd97a..09f6b7d634a 100644 --- a/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java @@ -297,21 +297,6 @@ public class BubblePreferenceControllerTest { assertFalse(pref.isEnabled()); } - @Test - public void updateState_channel_channelNotBlockable() { - Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.pkg = "a"; - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new RestrictedSwitchPreference(mContext); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - @Test public void updateState_channel() { Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON); diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceControllerTest.java index 692a4b18b5c..9bd2f153c05 100644 --- a/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceControllerTest.java @@ -146,9 +146,9 @@ public class ConversationPriorityPreferenceControllerTest { @Test public void testUpdateState_notConfigurable() { + mController.setOverrideCanConfigure(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null, null, null, null); @@ -159,26 +159,10 @@ public class ConversationPriorityPreferenceControllerTest { } @Test - public void testUpdateState_systemButConfigurable() { + public void testUpdateState_Configurable() { + mController.setOverrideCanConfigure(true); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(false); - when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new ConversationPriorityPreference(mContext, null); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - - @Test - public void testUpdateState_defaultApp() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null, null, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java index 22a7b0946bc..7357bb3f12f 100644 --- a/tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java @@ -138,8 +138,8 @@ public class DndPreferenceControllerTest { @Test public void testUpdateState_notBlockable() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); mController.onResume(appRow, channel, null, null, null, null, null); Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application); diff --git a/tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java index 0db46789d19..5189beb6fbb 100644 --- a/tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java @@ -166,9 +166,9 @@ public class HighImportancePreferenceControllerTest { @Test public void testUpdateState_notConfigurable() { + mController.setOverrideCanConfigure(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null, null, null, null); @@ -179,26 +179,10 @@ public class HighImportancePreferenceControllerTest { } @Test - public void testUpdateState_systemButConfigurable() { + public void testUpdateState_Configurable() { + mController.setOverrideCanConfigure(true); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(false); - when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new RestrictedSwitchPreference(mContext, null); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - - @Test - public void testUpdateState_defaultApp() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null, null, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java index 223fa23324b..34f777a5cbd 100644 --- a/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java @@ -183,9 +183,9 @@ public class ImportancePreferenceControllerTest { @Test public void testUpdateState_notConfigurable() { + mController.setOverrideCanConfigure(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null, null, null, null); @@ -196,26 +196,10 @@ public class ImportancePreferenceControllerTest { } @Test - public void testUpdateState_systemButConfigurable() { + public void testUpdateState_Configurable() { + mController.setOverrideCanConfigure(true); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(false); - when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new ImportancePreference(mContext, null); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - - @Test - public void testUpdateState_defaultApp() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(appRow, channel, null, null, null, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java index e51a9e003ba..d977d8b091c 100644 --- a/tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java @@ -181,19 +181,6 @@ public class LightsPreferenceControllerTest { assertFalse(pref.isEnabled()); } - @Test - public void testUpdateState_notBlockable() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new RestrictedSwitchPreference(mContext); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - @Test public void testUpdateState_lightsOn() { NotificationChannel channel = mock(NotificationChannel.class); diff --git a/tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java index 3907db22f92..b3d5cf01d81 100644 --- a/tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java @@ -166,9 +166,9 @@ public class MinImportancePreferenceControllerTest { @Test public void testUpdateState_notConfigurable() { + mController.setOverrideCanConfigure(false); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_LOW); mController.onResume(appRow, channel, null, null, null, null, null); @@ -179,26 +179,11 @@ public class MinImportancePreferenceControllerTest { } @Test - public void testUpdateState_systemButConfigurable() { + public void testUpdateState_Configurable() { + mController.setOverrideCanConfigure(true); NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(false); - when(channel.getImportance()).thenReturn(IMPORTANCE_LOW); - mController.onResume(appRow, channel, null, null, null, null, null); - - Preference pref = new RestrictedSwitchPreference(mContext, null); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - - @Test - public void testUpdateState_defaultApp() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - appRow.systemApp = true; - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true); + when(channel.isBlockable()).thenReturn(true); when(channel.getImportance()).thenReturn(IMPORTANCE_LOW); mController.onResume(appRow, channel, null, null, null, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java index 1fb9942fcb2..8d31fe53354 100644 --- a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; +import static android.os.UserHandle.USER_SYSTEM; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -38,6 +39,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import android.provider.Settings; import androidx.preference.Preference; @@ -221,6 +223,109 @@ public class NotificationPreferenceControllerTest { verify(mBackend, times(1)).updateChannel(any(), anyInt(), any()); } + @Test + public void testIsChannelBlockable_postMigration_locked() { + Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + mController = new TestPreferenceController(mContext, mBackend); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; + NotificationChannel channel = mock(NotificationChannel.class); + when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); + mController.onResume(appRow, channel, null, null, null, null, null); + assertFalse(mController.isChannelBlockable()); + } + + @Test + public void testIsChannelBlockable_postMigration_locked_butChannelOff() { + Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + mController = new TestPreferenceController(mContext, mBackend); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; + NotificationChannel channel = mock(NotificationChannel.class); + when(channel.getImportance()).thenReturn(IMPORTANCE_NONE); + mController.onResume(appRow, channel, null, null, null, null, null); + assertTrue(mController.isChannelBlockable()); + } + + @Test + public void testIsChannelBlockable_postMigration_locked_butChannelBlockable() { + Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + mController = new TestPreferenceController(mContext, mBackend); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; + NotificationChannel channel = mock(NotificationChannel.class); + when(channel.isBlockable()).thenReturn(true); + when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); + mController.onResume(appRow, channel, null, null, null, null, null); + assertTrue(mController.isChannelBlockable()); + } + + @Test + public void testIsChannelGroupBlockable_postMigration_locked() { + Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + mController = new TestPreferenceController(mContext, mBackend); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; + NotificationChannelGroup channelGroup = mock(NotificationChannelGroup.class); + mController.onResume(appRow, null, channelGroup, null, null, null, null); + assertFalse(mController.isChannelGroupBlockable()); + } + + @Test + public void testIsChannelGroupBlockable_postMigration_locked_butChannelGroupOff() { + Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + mController = new TestPreferenceController(mContext, mBackend); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; + NotificationChannelGroup channelGroup = mock(NotificationChannelGroup.class); + when(channelGroup.isBlocked()).thenReturn(true); + mController.onResume(appRow, null, channelGroup, null, null, null, null); + assertTrue(mController.isChannelGroupBlockable()); + } + + @Test + public void testIsAppBlockable_postMigration_locked() { + Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + mController = new TestPreferenceController(mContext, mBackend); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; + appRow.banned = false; + mController.onResume(appRow, null, null, null, null, null, null); + assertFalse(mController.isAppBlockable()); + } + + @Test + public void testIsAppBlockable_postMigration_locked_butAppOff() { + Settings.Secure.putIntForUser(RuntimeEnvironment.application.getContentResolver(), + Settings.Secure.NOTIFICATION_PERMISSION_ENABLED, 1, USER_SYSTEM); + + mController = new TestPreferenceController(mContext, mBackend); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + appRow.lockedImportance = true; + appRow.banned = true; + mController.onResume(appRow, null, null, null, null, null, null); + assertFalse(mController.isAppBlockable()); + } + @Test public void testIsBlockable_oemAllowlist() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); diff --git a/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java index c79b97d3ba2..273bcdbe213 100644 --- a/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java @@ -182,20 +182,6 @@ public class SoundPreferenceControllerTest { assertFalse(pref.isEnabled()); } - @Test - public void testUpdateState_notBlockable() { - NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); - NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); - mController.onResume(appRow, channel, null, null, null, null, null); - - AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); - Preference pref = new NotificationSoundPreference(mContext, attributeSet); - mController.updateState(pref); - - assertTrue(pref.isEnabled()); - } - @Test public void testUpdateState_configurable() { Uri sound = Settings.System.DEFAULT_ALARM_ALERT_URI; diff --git a/tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java index 0fb5e72eb51..ad6df604654 100644 --- a/tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java @@ -162,10 +162,9 @@ public class VibrationPreferenceControllerTest { } @Test - public void testUpdateState_notBlockable() { + public void testUpdateState_blockable() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); - when(channel.isImportanceLockedByOEM()).thenReturn(true); mController.onResume(appRow, channel, null, null, null, null, null); Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application); diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index c99d5c99d8e..6749c1761b8 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -724,6 +724,7 @@ public class SettingsSliceProviderTest { .setIcon(SliceTestUtils.FAKE_ICON) .setFragmentName(SliceTestUtils.FAKE_FRAGMENT_NAME) .setPreferenceControllerClassName(SliceTestUtils.FAKE_CONTROLLER_NAME) + .setHighlightMenuRes(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES) .build(); } diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index 1809906a968..f47c5f95edf 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -333,6 +333,8 @@ public class SliceBroadcastReceiverTest { values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, SliceTestUtils.FAKE_FRAGMENT_NAME); values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass); values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI, buildUri(key).toSafeString()); + values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE, + SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values); } diff --git a/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java index 1c9164a6a84..97beeb32471 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java +++ b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java @@ -35,6 +35,7 @@ class SliceTestUtils { public static final int FAKE_ICON = 1234; public static final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName(); public static final String FAKE_CONTROLLER_NAME = FakeToggleController.class.getName(); + public static final int FAKE_HIGHLIGHT_MENU_RES = FakeToggleController.HIGHLIGHT_MENU_RES; public static void insertSliceToDb(Context context, String key) { @@ -75,6 +76,8 @@ class SliceTestUtils { values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE, customizedUnavailableSliceSubtitle); values.put(SlicesDatabaseHelper.IndexColumns.PUBLIC_SLICE, isPublicSlice); + values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE, + FAKE_HIGHLIGHT_MENU_RES); db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values); db.close(); diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index f7b1f1c99d3..f00f8b1e138 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -104,6 +104,7 @@ public class SlicesDatabaseAccessorTest { assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME); assertThat(data.getUri()).isNull(); assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME); + assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); assertThat(data.getUnavailableSliceSubtitle()).isNull(); } @@ -125,6 +126,7 @@ public class SlicesDatabaseAccessorTest { assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME); assertThat(data.getUri()).isNull(); assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME); + assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); } @Test(expected = IllegalStateException.class) @@ -159,6 +161,7 @@ public class SlicesDatabaseAccessorTest { assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME); assertThat(data.getUri()).isEqualTo(uri); assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME); + assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); } @Test(expected = IllegalStateException.class) @@ -303,6 +306,7 @@ public class SlicesDatabaseAccessorTest { assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME); assertThat(data.getUri()).isNull(); assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME); + assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); assertThat(data.getUnavailableSliceSubtitle()).isNull(); } @@ -324,6 +328,7 @@ public class SlicesDatabaseAccessorTest { assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME); assertThat(data.getUri()).isNull(); assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME); + assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); assertThat(data.getUnavailableSliceSubtitle()).isEqualTo(subtitle); } diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java index 87d0cd40104..60ddef546ce 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java @@ -44,17 +44,18 @@ import java.util.List; @RunWith(RobolectricTestRunner.class) public class SlicesIndexerTest { - private final String[] KEYS = new String[]{"key1", "key2", "key3"}; - private final String[] TITLES = new String[]{"title1", "title2", "title3"}; - private final String SUMMARY = "subtitle"; - private final String SCREEN_TITLE = "screen title"; - private final String KEYWORDS = "a, b, c"; - private final String FRAGMENT_NAME = "fragment name"; - private final int ICON = 1234; // I declare a thumb war - private final Uri URI = Uri.parse("content://com.android.settings.slices/test"); - private final String PREF_CONTROLLER = "com.android.settings.slices.tester"; - private final int SLICE_TYPE = SliceData.SliceType.SLIDER; - private final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice"; + private static final String[] KEYS = new String[]{"key1", "key2", "key3"}; + private static final String[] TITLES = new String[]{"title1", "title2", "title3"}; + private static final String SUMMARY = "subtitle"; + private static final String SCREEN_TITLE = "screen title"; + private static final String KEYWORDS = "a, b, c"; + private static final String FRAGMENT_NAME = "fragment name"; + private static final int ICON = 1234; // I declare a thumb war + private static final Uri URI = Uri.parse("content://com.android.settings.slices/test"); + private static final String PREF_CONTROLLER = "com.android.settings.slices.tester"; + private static final int SLICE_TYPE = SliceData.SliceType.SLIDER; + private static final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice"; + private static final int HIGHLIGHT_MENU_KEY = 5678; // I declare a thumb war private Context mContext; @@ -145,6 +146,9 @@ public class SlicesIndexerTest { .isEqualTo(UNAVAILABLE_SLICE_SUBTITLE); assertThat(cursor.getInt( cursor.getColumnIndex(IndexColumns.PUBLIC_SLICE))).isEqualTo(0); + assertThat(cursor.getInt( + cursor.getColumnIndex(IndexColumns.HIGHLIGHT_MENU_RESOURCE))) + .isEqualTo(HIGHLIGHT_MENU_KEY); cursor.moveToNext(); } } finally { @@ -191,6 +195,9 @@ public class SlicesIndexerTest { .isEqualTo(UNAVAILABLE_SLICE_SUBTITLE); assertThat(cursor.getInt( cursor.getColumnIndex(IndexColumns.PUBLIC_SLICE))).isEqualTo(1); + assertThat(cursor.getInt( + cursor.getColumnIndex(IndexColumns.HIGHLIGHT_MENU_RESOURCE))) + .isEqualTo(HIGHLIGHT_MENU_KEY); cursor.moveToNext(); } } finally { @@ -224,7 +231,8 @@ public class SlicesIndexerTest { .setUri(URI) .setPreferenceControllerClassName(PREF_CONTROLLER) .setSliceType(SLICE_TYPE) - .setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE); + .setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE) + .setHighlightMenuRes(HIGHLIGHT_MENU_KEY); if (isPublicSlice) { builder.setIsPublicSlice(true); diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java index 68124512cfc..4e968a29c70 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java @@ -27,6 +27,7 @@ import com.android.settings.slices.SliceBackgroundWorker; public class FakeToggleController extends TogglePreferenceController { public static final String AVAILABILITY_KEY = "fake_toggle_availability_key"; + public static final int HIGHLIGHT_MENU_RES = 5678; public static final IntentFilter INTENT_FILTER = new IntentFilter( WifiManager.WIFI_AP_STATE_CHANGED_ACTION); @@ -70,6 +71,11 @@ public class FakeToggleController extends TogglePreferenceController { return true; } + @Override + public int getSliceHighlightMenuRes() { + return HIGHLIGHT_MENU_RES; + } + @Override public Class getBackgroundWorkerClass() { return TestWorker.class; diff --git a/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java index 8817a176203..13e8c13c5fa 100644 --- a/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -119,6 +119,11 @@ public class TogglePreferenceControllerTest { return true; } + @Override + public int getSliceHighlightMenuRes() { + return 5678; + } + @Override public int getAvailabilityStatus() { return AVAILABLE; diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java index 7d4323051c3..df6a38b20a1 100644 --- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java +++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java @@ -302,6 +302,11 @@ public class ProviderModelSliceHelperTest { public Intent getIntent() { return new Intent(); } + + @Override + public int getSliceHighlightMenuRes() { + return 0; + } } private class MockProviderModelSliceHelper extends ProviderModelSliceHelper { diff --git a/tests/unit/src/com/android/settings/slices/SliceTestUtils.java b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java index 1b035cd57a7..40a827a8a99 100644 --- a/tests/unit/src/com/android/settings/slices/SliceTestUtils.java +++ b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java @@ -35,6 +35,7 @@ class SliceTestUtils { public static final int FAKE_ICON = 1234; public static final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName(); public static final String FAKE_CONTROLLER_NAME = FakeToggleController.class.getName(); + public static final int FAKE_HIGHLIGHT_MENU_RES = FakeToggleController.HIGHLIGHT_MENU_RES; public static void insertSliceToDb(Context context, String key) { @@ -75,6 +76,8 @@ class SliceTestUtils { values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE, customizedUnavailableSliceSubtitle); values.put(SlicesDatabaseHelper.IndexColumns.PUBLIC_SLICE, isPublicSlice); + values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE, + FAKE_HIGHLIGHT_MENU_RES); db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values); db.close(); diff --git a/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java index 4fcbd15d16e..490b7bd62c6 100644 --- a/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java +++ b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java @@ -143,5 +143,10 @@ public class SpecialCaseSliceManagerTest { public Intent getIntent() { return null; } + + @Override + public int getSliceHighlightMenuRes() { + return 0; + } } } diff --git a/tests/unit/src/com/android/settings/testutils/FakeToggleController.java b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java index 9eda8b6a802..c232479d61c 100644 --- a/tests/unit/src/com/android/settings/testutils/FakeToggleController.java +++ b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java @@ -27,6 +27,7 @@ import com.android.settings.slices.SliceBackgroundWorker; public class FakeToggleController extends TogglePreferenceController { public static final String AVAILABILITY_KEY = "fake_toggle_availability_key"; + public static final int HIGHLIGHT_MENU_RES = 5678; public static final IntentFilter INTENT_FILTER = new IntentFilter( WifiManager.WIFI_AP_STATE_CHANGED_ACTION); @@ -70,6 +71,11 @@ public class FakeToggleController extends TogglePreferenceController { return true; } + @Override + public int getSliceHighlightMenuRes() { + return HIGHLIGHT_MENU_RES; + } + @Override public Class getBackgroundWorkerClass() { return TestWorker.class;