Merge "Allow wireless charging label to customize content descriptions" into main

src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java

@@ -97,6 +97,9 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
             final CharSequence wirelessChargingLabel =
                     mBatterySettingsFeatureProvider.getWirelessChargingLabel(mContext, info);
             if (wirelessChargingLabel != null) {
+                mBatteryUsageProgressBarPref.setBottomSummaryContentDescription(
+                        mBatterySettingsFeatureProvider
+                                .getWirelessChargingContentDescription(mContext, info));
                 return wirelessChargingLabel;
             }
         }

src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java

@@ -49,6 +49,11 @@ public interface BatterySettingsFeatureProvider {
     @Nullable
     CharSequence getWirelessChargingLabel(@NonNull Context context, @NonNull BatteryInfo info);
 
+    /** Return a content description for the bottom summary during wireless charging. */
+    @Nullable
+    CharSequence getWirelessChargingContentDescription(
+            @NonNull Context context, @NonNull BatteryInfo info);
+
     /** Return a charging remaining time label for wireless charging. */
     @Nullable
     CharSequence getWirelessChargingRemainingLabel(

src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java

@@ -61,6 +61,13 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur
         return null;
     }
 
+    @Nullable
+    @Override
+    public CharSequence getWirelessChargingContentDescription(
+            @NonNull Context context, @NonNull BatteryInfo info) {
+        return null;
+    }
+
     @Nullable
     @Override
     public CharSequence getWirelessChargingRemainingLabel(