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

Commit 097cd124 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add Battery Information page" into udc-qpr-dev

parents 40dd0958 da0702a1
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -2644,6 +2644,8 @@
    <string name="build_number">Build number</string>
    <!-- About phone screen, tapping this button will take user to a seperate UI to check Google Play system update [CHAR LIMIT=60] -->
    <string name="module_version">Google Play system update</string>
    <!-- About phone screen, show a list of battery information  [CHAR LIMIT=60] -->
    <string name="battery_info">Battery information</string>
    <!-- About phone screen, show when a value of some status item is unavailable. -->
    <string name="device_info_not_available">Not available</string>
@@ -2715,6 +2717,14 @@
    <string name="status_serial_number">Serial number</string>
    <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
    <string name="status_up_time">Up time</string>
    <!-- About phone, status item title. The battery manufacture date. [CHAR LIMIT=60]-->
    <string name="battery_manufacture_date">Manufacture date</string>
    <!-- About phone, status item title. Date of first use of the battery. [CHAR LIMIT=60]-->
    <string name="battery_first_use_date">Date of first use</string>
    <!-- About phone, status item title. Count of battery full charge/discharge cycles [CHAR LIMIT=60]-->
    <string name="battery_cycle_count">Cycle count</string>
    <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
    <string name="memory_calculating_size">Calculating\u2026</string>
@@ -7008,6 +7018,7 @@
    <string name="keywords_sim_status_iccid_esim">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid, eid</string>
    <string name="keywords_esim_eid">eid</string>
    <string name="keywords_model_and_hardware">serial number, hardware version</string>
    <string name="keywords_battery_info">battery info, manufacture date, cycle count, first use</string>
    <string name="keywords_android_version">android security patch level, baseband version, kernel version</string>
    <!-- Search keywords for dark mode settings [CHAR LIMIT=NONE] -->
    <string name="keywords_dark_ui_mode">theme, light, dark, mode, light sensitivity, photophobia, make darker, darken, dark mode, migraine</string>
+45 −0
Original line number Diff line number Diff line
<?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>
+8 −0
Original line number Diff line number Diff line
@@ -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
+3 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ import com.android.settings.deviceinfo.PrivateVolumeForget;
import com.android.settings.deviceinfo.PublicVolumeSettings;
import com.android.settings.deviceinfo.StorageDashboardFragment;
import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
import com.android.settings.deviceinfo.batteryinfo.BatteryInfoFragment;
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
import com.android.settings.display.AutoBrightnessSettings;
@@ -371,7 +372,8 @@ public class SettingsGateway {
            NfcAndPaymentFragment.class.getName(),
            ColorAndMotionFragment.class.getName(),
            LongBackgroundTasksDetails.class.getName(),
            RegionalPreferencesEntriesFragment.class.getName()
            RegionalPreferencesEntriesFragment.class.getName(),
            BatteryInfoFragment.class.getName()
    };

    public static final String[] SETTINGS_FOR_RESTRICTED = {
+49 −0
Original line number Diff line number Diff line
/*
 * 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.
 */

package com.android.settings.deviceinfo.batteryinfo;

import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.BatteryManager;

import com.android.settings.core.BasePreferenceController;

/**
 * A controller that manages the information about battery cycle count.
 */
public class BatteryCycleCountPreferenceController extends BasePreferenceController {

    public BatteryCycleCountPreferenceController(Context context,
            String preferenceKey) {
        super(context, preferenceKey);
    }

    @Override
    public int getAvailabilityStatus() {
        return AVAILABLE;
    }

    @Override
    public CharSequence getSummary() {
        final IntentFilter intentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
        final Intent batteryStatus = mContext.registerReceiver(null, intentFilter);
        final int cycleCount = batteryStatus.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT, -1);

        return Integer.toString(cycleCount);
    }
}
Loading