Merge "Reindexing Settings Battery main page(1/2)" into sc-dev

This commit is contained in:
Wesley Wang
2021-03-19 12:24:50 +00:00
committed by Android (Google) Code Review

View File

@@ -40,32 +40,30 @@
android:title="@string/summary_placeholder" android:title="@string/summary_placeholder"
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" /> settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
<PreferenceCategory> <Preference
<SwitchPreference android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
android:key="battery_percentage" android:key="battery_saver_summary"
android:title="@string/battery_percentage" android:title="@string/battery_saver"
android:summary="@string/battery_percentage_description" app:iconSpaceReserved="false"
settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" /> settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
</PreferenceCategory>
<PreferenceCategory> <Preference
<Preference android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" android:key="smart_battery_manager"
android:key="battery_saver_summary" android:title="@string/smart_battery_manager_title"
android:title="@string/battery_saver" app:iconSpaceReserved="false"
settings:controller="com.android.settings.fuelgauge.BatterySaverController" /> settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" />
<Preference <SwitchPreference
android:fragment="com.android.settings.fuelgauge.SmartBatterySettings" android:key="battery_percentage"
android:key="smart_battery_manager" android:title="@string/battery_percentage"
android:title="@string/smart_battery_manager_title" android:summary="@string/battery_percentage_description"
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" /> app:iconSpaceReserved="false"
</PreferenceCategory> settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="power_usage_footer" android:key="power_usage_footer"
android:title="@string/battery_footer_summary" android:title="@string/battery_footer_summary"
android:selectable="false" android:selectable="false"
settings:searchable="false" settings:searchable="false" />
settings:allowDividerAbove="true" />
</PreferenceScreen> </PreferenceScreen>