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

Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev am: fcd80ade3b am: 3924138fb7

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

Change-Id: I4e50da4138c440758314c169699439cf8f9bad1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-21 07:40:16 +00:00
committed by Automerger Merge Worker
parent 6ceab64548 3924138fb7
commit 3b03be9fe3
7 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ public class BatteryFirstUseDatePreferenceController extends BasePreferenceContr
@Override
public int getAvailabilityStatus() {
return mBatterySettingsFeatureProvider.isFirstUseDateAvailable(getFirstUseDate())
return mBatterySettingsFeatureProvider.isFirstUseDateAvailable(mContext, getFirstUseDate())
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}

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

@@ -45,7 +45,8 @@ public class BatteryManufactureDatePreferenceController extends BasePreferenceCo
@Override
public int getAvailabilityStatus() {
return mBatterySettingsFeatureProvider.isManufactureDateAvailable(getManufactureDate())
return mBatterySettingsFeatureProvider.isManufactureDateAvailable(mContext,
getManufactureDate())
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}

6
src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
View File

@@ -16,12 +16,14 @@
package com.android.settings.fuelgauge;
import android.content.Context;
/** Feature provider for battery settings usage. */
public interface BatterySettingsFeatureProvider {
/** Returns true if manufacture date should be shown */
boolean isManufactureDateAvailable(long manufactureDateMs);
boolean isManufactureDateAvailable(Context context, long manufactureDateMs);
/** Returns true if first use date should be shown */
boolean isFirstUseDateAvailable(long firstUseDateMs);
boolean isFirstUseDateAvailable(Context context, long firstUseDateMs);
}

6
src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
View File

@@ -16,16 +16,18 @@
package com.android.settings.fuelgauge;
import android.content.Context;
/** Feature provider implementation for battery settings usage. */
public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatureProvider {
@Override
public boolean isManufactureDateAvailable(long manufactureDateMs) {
public boolean isManufactureDateAvailable(Context context, long manufactureDateMs) {
return false;
}
@Override
public boolean isFirstUseDateAvailable(long firstUseDateMs) {
public boolean isFirstUseDateAvailable(Context context, long firstUseDateMs) {
return false;
}
}