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

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

Change-Id: I5450f605db779b349155d55430c1c55e9a64250c
This commit is contained in:
Wesley Wang
2021-03-19 12:43:27 +00:00
committed by Automerger Merge Worker

View File

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