Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 547e9403 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move old battery settings page to dev options"

parents 96fc83d8 6cbe94c1
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -9342,4 +9342,6 @@
    <!-- 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>
    <!-- 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>
+5 −1
Original line number Diff line number Diff line
@@ -76,6 +76,11 @@
            android:summary="@string/runningservices_settings_summary"
            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
            android:key="convert_to_file_encryption"
            android:title="@string/convert_to_file_encryption"
@@ -471,7 +476,6 @@
            android:entries="@array/app_process_limit_entries"
            android:entryValues="@array/app_process_limit_values" />


        <Preference
            android:key="background_check"
            android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"