Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654 Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
2021-11-02 02:43:42 +00:00
parent ae5f30b15a 026b1b5df6
commit 7f6b9e26c9
124 changed files with 760 additions and 82 deletions
--- a/src/com/android/settings/core/TogglePreferenceController.java
+++ b/src/com/android/settings/core/TogglePreferenceController.java
@@ -89,4 +89,7 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle
    public boolean isPublicSlice() {
        return false;
    }
+
+    @Override
+    public abstract int getSliceHighlightMenuRes();
 }