Merge "Add Battery Information page" into udc-qpr-dev am: 097cd12494 am: 8cef9b67aa

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

Change-Id: I057b22808d87fe753e8d6bccd2fb1702eaf2186c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-22 02:30:19 +00:00
committed by Automerger Merge Worker
11 changed files with 455 additions and 1 deletions

45
res/xml/battery_info.xml Normal file
View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2023 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/battery_info"
settings:keywords="@string/keywords_battery_info">
<Preference
android:key="battery_info_manufacture_date"
android:title="@string/battery_manufacture_date"
android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.deviceinfo.batteryinfo.BatteryManufactureDatePreferenceController"
settings:enableCopying="true"/>
<Preference
android:key="battery_info_first_use_date"
android:title="@string/battery_first_use_date"
android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.deviceinfo.batteryinfo.BatteryFirstUseDatePreferenceController"
settings:enableCopying="true"/>
<Preference
android:key="battery_info_cycle_count"
android:title="@string/battery_cycle_count"
android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.deviceinfo.batteryinfo.BatteryCycleCountPreferenceController"
settings:enableCopying="true"/>
</PreferenceScreen>

View File

@@ -144,6 +144,14 @@
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
<!-- Battery information -->
<Preference
android:key="battery_info"
android:order="43"
android:title="@string/battery_info"
android:fragment="com.android.settings.deviceinfo.batteryinfo.BatteryInfoFragment"
settings:keywords="@string/keywords_battery_info"/>
</PreferenceCategory>
<PreferenceCategory