Merge "Move old battery settings page to dev options"

This commit is contained in:
TreeHugger Robot
2018-02-08 04:48:22 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 1 deletions

View File

@@ -9342,4 +9342,6 @@
<!-- Settings item summary for automatic Bluetooth on while driving preference [CHAR LIMIT=100] --> <!-- Settings item summary for automatic Bluetooth on while driving preference [CHAR LIMIT=100] -->
<string name="bluetooth_on_while_driving_summary">Turn on Bluetooth automatically when driving</string> <string name="bluetooth_on_while_driving_summary">Turn on Bluetooth automatically when driving</string>
<!-- Title for item to go to old battery settings page when clicking [CHAR LIMIT=100] -->
<string name="dev_android_o_battery_settings_title">See Android 8.0 battery settings</string>
</resources> </resources>

View File

@@ -76,6 +76,11 @@
android:summary="@string/runningservices_settings_summary" android:summary="@string/runningservices_settings_summary"
android:fragment="com.android.settings.applications.RunningServices" /> android:fragment="com.android.settings.applications.RunningServices" />
<Preference
android:key="android_o_battery_settings"
android:fragment="com.android.settings.fuelgauge.PowerUsageSummaryLegacy"
android:title="@string/dev_android_o_battery_settings_title" />
<Preference <Preference
android:key="convert_to_file_encryption" android:key="convert_to_file_encryption"
android:title="@string/convert_to_file_encryption" android:title="@string/convert_to_file_encryption"
@@ -471,7 +476,6 @@
android:entries="@array/app_process_limit_entries" android:entries="@array/app_process_limit_entries"
android:entryValues="@array/app_process_limit_values" /> android:entryValues="@array/app_process_limit_values" />
<Preference <Preference
android:key="background_check" android:key="background_check"
android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary" android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"