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

Not show time information in battery optimization page when opened from

Browse Source 
Settings -> Apps

Test: make RunSettingsRoboTests + manual
Bug: 265130434
Change-Id: Ie7ae6a97041f490e81adbe8e0c530799e09a7c66
This commit is contained in:
Kuan Wang
2023-01-16 12:07:07 +08:00
parent a7999098e0
commit 96aee4896b
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
View File

@@ -121,11 +121,11 @@ public class AppBatteryPreferenceController extends BasePreferenceController
Log.i(TAG, "handlePreferenceTreeClick():\n" + mBatteryDiffEntry); Log.i(TAG, "handlePreferenceTreeClick():\n" + mBatteryDiffEntry);
AdvancedPowerUsageDetail.startBatteryDetailPage( AdvancedPowerUsageDetail.startBatteryDetailPage(
mParent.getActivity(), mParent.getActivity(),
mParent, mParent.getMetricsCategory(),
mBatteryDiffEntry, mBatteryDiffEntry,
Utils.formatPercentage( Utils.formatPercentage(
mBatteryDiffEntry.getPercentOfTotal(), /* round */ true), mBatteryDiffEntry.getPercentOfTotal(), /* round */ true),
/*slotInformation=*/ null); /*slotInformation=*/ null, /*showTimeInformation=*/ false);
return true; return true;
} }

14
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -139,13 +139,15 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
Activity caller, InstrumentedPreferenceFragment fragment, Activity caller, InstrumentedPreferenceFragment fragment,
BatteryDiffEntry diffEntry, String usagePercent, String slotInformation) { BatteryDiffEntry diffEntry, String usagePercent, String slotInformation) {
startBatteryDetailPage( startBatteryDetailPage(
caller, fragment.getMetricsCategory(), diffEntry, usagePercent, slotInformation); caller, fragment.getMetricsCategory(), diffEntry, usagePercent, slotInformation,
/*showTimeInformation=*/ true);
} }
/** Launches battery details page for an individual battery consumer fragment. */ /** Launches battery details page for an individual battery consumer fragment. */
public static void startBatteryDetailPage( public static void startBatteryDetailPage(
Context context, int sourceMetricsCategory, Context context, int sourceMetricsCategory,
BatteryDiffEntry diffEntry, String usagePercent, String slotInformation) { BatteryDiffEntry diffEntry, String usagePercent, String slotInformation,
boolean showTimeInformation) {
final BatteryHistEntry histEntry = diffEntry.mBatteryHistEntry; final BatteryHistEntry histEntry = diffEntry.mBatteryHistEntry;
final LaunchBatteryDetailPageArgs launchArgs = new LaunchBatteryDetailPageArgs(); final LaunchBatteryDetailPageArgs launchArgs = new LaunchBatteryDetailPageArgs();
// configure the launch argument. // configure the launch argument.
@@ -156,9 +158,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
launchArgs.mUid = (int) histEntry.mUid; launchArgs.mUid = (int) histEntry.mUid;
launchArgs.mIconId = diffEntry.getAppIconId(); launchArgs.mIconId = diffEntry.getAppIconId();
launchArgs.mConsumedPower = (int) diffEntry.mConsumePower; launchArgs.mConsumedPower = (int) diffEntry.mConsumePower;
launchArgs.mForegroundTimeMs = diffEntry.mForegroundUsageTimeInMs; if (showTimeInformation) {
launchArgs.mBackgroundTimeMs = diffEntry.mBackgroundUsageTimeInMs; launchArgs.mForegroundTimeMs = diffEntry.mForegroundUsageTimeInMs;
launchArgs.mScreenOnTimeMs = diffEntry.mScreenOnTimeInMs; launchArgs.mBackgroundTimeMs = diffEntry.mBackgroundUsageTimeInMs;
launchArgs.mScreenOnTimeMs = diffEntry.mScreenOnTimeInMs;
}
launchArgs.mIsUserEntry = histEntry.isUserEntry(); launchArgs.mIsUserEntry = histEntry.isUserEntry();
startBatteryDetailPage(context, sourceMetricsCategory, launchArgs); startBatteryDetailPage(context, sourceMetricsCategory, launchArgs);
} }

1
src/com/android/settings/spa/app/appinfo/AppBatteryPreference.kt
View File

@@ -126,6 +126,7 @@ private class AppBatteryPresenter(private val context: Context, private val app:
this, this,
Utils.formatPercentage(percentOfTotal, true), Utils.formatPercentage(percentOfTotal, true),
null, null,
false,
) )
} }

1
tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppBatteryPreferenceTest.kt
View File

@@ -162,6 +162,7 @@ class AppBatteryPreferenceTest {
batteryDiffEntry, batteryDiffEntry,
"10%", "10%",
null, null,
false,
) )
} }
} }