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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792

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);

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(),

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;
+    }
 }