PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant methods and refactor

Browse Source 
Remove the summary method and write the code in AOSP directly instead to
force string consistency. Also refactor a bit after the modification.

Fixes: 276399056
Test: robotests
Change-Id: I76ad740b694363a3cdfb3748e41c840fb678b93d
This commit is contained in:
Yi-Ling Chuang
2023-06-10 00:13:58 +08:00
parent 2856b252d6
commit f148baa372
13 changed files with 139 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceController.java
View File

@@ -17,32 +17,51 @@
package com.android.settings.deviceinfo.batteryinfo;
import android.content.Context;
import android.os.BatteryManager;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.overlay.FeatureFactory;
import java.util.concurrent.TimeUnit;
/**
* A controller that manages the information about battery first use date.
*/
public class BatteryFirstUseDatePreferenceController extends BasePreferenceController {
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
private final BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
private final BatteryManager mBatteryManager;
private long mFirstUseDateInMs;
public BatteryFirstUseDatePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mBatterySettingsFeatureProvider = FeatureFactory.getFactory(
context).getBatterySettingsFeatureProvider(context);
context).getBatterySettingsFeatureProvider();
mBatteryManager = mContext.getSystemService(BatteryManager.class);
}
@Override
public int getAvailabilityStatus() {
return mBatterySettingsFeatureProvider.isFirstUseDateAvailable()
return mBatterySettingsFeatureProvider.isFirstUseDateAvailable(getFirstUseDate())
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public CharSequence getSummary() {
return mBatterySettingsFeatureProvider.getFirstUseDateSummary();
return isAvailable()
? BatteryUtils.getBatteryInfoFormattedDate(mFirstUseDateInMs)
: null;
}
private long getFirstUseDate() {
if (mFirstUseDateInMs == 0L) {
final long firstUseDateInSec = mBatteryManager.getLongProperty(
BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE);
mFirstUseDateInMs = TimeUnit.MILLISECONDS.convert(firstUseDateInSec, TimeUnit.SECONDS);
}
return mFirstUseDateInMs;
}
}

28
src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceController.java
View File

@@ -17,32 +17,52 @@
package com.android.settings.deviceinfo.batteryinfo;
import android.content.Context;
import android.os.BatteryManager;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.overlay.FeatureFactory;
import java.util.concurrent.TimeUnit;
/**
* A controller that manages the information about battery manufacture date.
*/
public class BatteryManufactureDatePreferenceController extends BasePreferenceController {
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
private final BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
private final BatteryManager mBatteryManager;
private long mManufactureDateInMs;
public BatteryManufactureDatePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mBatterySettingsFeatureProvider = FeatureFactory.getFactory(
context).getBatterySettingsFeatureProvider(context);
context).getBatterySettingsFeatureProvider();
mBatteryManager = mContext.getSystemService(BatteryManager.class);
}
@Override
public int getAvailabilityStatus() {
return mBatterySettingsFeatureProvider.isManufactureDateAvailable()
return mBatterySettingsFeatureProvider.isManufactureDateAvailable(getManufactureDate())
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public CharSequence getSummary() {
return mBatterySettingsFeatureProvider.getManufactureDateSummary();
return isAvailable()
? BatteryUtils.getBatteryInfoFormattedDate(mManufactureDateInMs)
: null;
}
private long getManufactureDate() {
if (mManufactureDateInMs == 0L) {
final long manufactureDateInSec = mBatteryManager.getLongProperty(
BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE);
mManufactureDateInMs = TimeUnit.MILLISECONDS.convert(manufactureDateInSec,
TimeUnit.SECONDS);
}
return mManufactureDateInMs;
}
}