Combine screen on time map into battery usage map

This cl is refactor only. It makes next cl ag/22809776 easy to replace screen
compenent time with screen on time.

Bug: 278022529
Test: manual
Change-Id: I2538aeafb0c697f13ec617cea44a70a1b2a114b0

src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java

@@ -34,17 +34,20 @@ import java.util.Set;
 public class BatteryDiffData {
     static final double SMALL_PERCENTAGE_THRESHOLD = 1f;
 
+    private final long mScreenOnTime;
     private final List<BatteryDiffEntry> mAppEntries;
     private final List<BatteryDiffEntry> mSystemEntries;
 
     /** Constructor for the diff entries. */
     public BatteryDiffData(
             final Context context,
+            final long screenOnTime,
             final @NonNull List<BatteryDiffEntry> appDiffEntries,
             final @NonNull List<BatteryDiffEntry> systemDiffEntries,
             final @NonNull Set<String> systemAppsPackageNames,
             final @NonNull Set<Integer> systemAppsUids,
             final boolean isAccumulated) {
+        mScreenOnTime = screenOnTime;
         mAppEntries = appDiffEntries;
         mSystemEntries = systemDiffEntries;
 
@@ -60,6 +63,10 @@ public class BatteryDiffData {
         processAndSortEntries(mSystemEntries);
     }
 
+    public long getScreenOnTime() {
+        return mScreenOnTime;
+    }
+
     public List<BatteryDiffEntry> getAppDiffEntryList() {
         return mAppEntries;
     }