diff --git a/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java b/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java index 6351621d2e1..a46ae7a728c 100644 --- a/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java +++ b/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java @@ -95,6 +95,6 @@ public class BiometricSettingsAppPreferenceController extends TogglePreferenceCo @Override public int getSliceHighlightMenuRes() { // not needed since it's not sliceable - return 0; + return NO_RES; } } diff --git a/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java b/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java index 4101963cf49..2d2255805cc 100644 --- a/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java +++ b/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java @@ -77,6 +77,6 @@ public class BiometricSettingsKeyguardPreferenceController extends TogglePrefere @Override public int getSliceHighlightMenuRes() { // not needed since it's not sliceable - return 0; + return NO_RES; } } diff --git a/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java index a8bff6b4197..bda078f2711 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java @@ -55,6 +55,6 @@ public abstract class FaceSettingsPreferenceController extends TogglePreferenceC @Override public int getSliceHighlightMenuRes() { // not needed since it's not sliceable - return 0; + return NO_RES; } } diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java index 2bab3e97a86..93e6d0a9644 100644 --- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java +++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java @@ -120,7 +120,7 @@ public class LocationTimeZoneDetectionPreferenceController @Override public int getSliceHighlightMenuRes() { // not needed since it's not sliceable - return 0; + return NO_RES; } @Override diff --git a/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java index 3d6695b1a37..52694af537c 100644 --- a/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java +++ b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java @@ -55,7 +55,7 @@ public class EmergencyGestureSoundPreferenceController extends TogglePreferenceC @Override public int getSliceHighlightMenuRes() { // not needed since it's not sliceable - return 0; + return NO_RES; } @Override diff --git a/src/com/android/settings/flashlight/FlashlightSlice.java b/src/com/android/settings/flashlight/FlashlightSlice.java index f18d7122cf7..eaf059aa673 100644 --- a/src/com/android/settings/flashlight/FlashlightSlice.java +++ b/src/com/android/settings/flashlight/FlashlightSlice.java @@ -120,7 +120,7 @@ public class FlashlightSlice implements CustomSliceable { @Override public int getSliceHighlightMenuRes() { // no landing page in Settings - return 0; + return NO_RES; } private static String getCameraId(Context context) throws CameraAccessException { diff --git a/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java b/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java index 46f279db260..e3609cb214b 100644 --- a/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java +++ b/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java @@ -68,7 +68,7 @@ public abstract class TelephonyTogglePreferenceController extends TogglePreferen @Override public int getSliceHighlightMenuRes() { // not needed since it's not sliceable - return 0; + return NO_RES; } /** diff --git a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java index 9e3566498b0..eeb9924f50e 100644 --- a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java @@ -91,7 +91,7 @@ public class BubbleNotificationPreferenceController extends @Override public int getSliceHighlightMenuRes() { // not needed since it's not sliceable - return 0; + return NO_RES; } @Override diff --git a/src/com/android/settings/slices/Sliceable.java b/src/com/android/settings/slices/Sliceable.java index 31555df0022..406cb3aeb73 100644 --- a/src/com/android/settings/slices/Sliceable.java +++ b/src/com/android/settings/slices/Sliceable.java @@ -25,6 +25,7 @@ import android.content.IntentFilter; import android.net.Uri; import android.widget.Toast; +import androidx.annotation.StringRes; import androidx.slice.Slice; import com.android.settings.R; @@ -135,10 +136,16 @@ public interface Sliceable { } /** - * @return a resource ID that indicates which menu entry should be highlighted in multi-pane - * mode. + * Used to mark a {@link Sliceable} that has no highlight menu string resource. */ - default int getSliceHighlightMenuRes() { - return 0; + int NO_RES = 0; + + /** + * @return a string resource declared in res/values/menu_keys.xml that indicates which menu + * entry should be highlighted in two-pane mode, or {@link #NO_RES} representing highlighting is + * not applicable. + */ + @StringRes default int getSliceHighlightMenuRes() { + return NO_RES; } } diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java index df6a38b20a1..8687e5ada64 100644 --- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java +++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java @@ -305,7 +305,7 @@ public class ProviderModelSliceHelperTest { @Override public int getSliceHighlightMenuRes() { - return 0; + return NO_RES; } } diff --git a/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java index 490b7bd62c6..38347e91ca1 100644 --- a/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java +++ b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java @@ -146,7 +146,7 @@ public class SpecialCaseSliceManagerTest { @Override public int getSliceHighlightMenuRes() { - return 0; + return NO_RES; } } }