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

Commit defccd35 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge changes I025f980e,Id61b739a,I091ceceb into main 

* changes:
  Visualize power breakdown by screen on/off and battery on/charging
  Add missing BatteryUsageStatsQuery fields to parceling
  Update BatteryStatsViewer UI to reflect the removal of PowerModel
parents 89844eb2 e633ebfb

core/java/android/os/BatteryUsageStatsQuery.java

+20 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.internal.os.MonotonicClock; 


import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Arrays;



/**

 * Query parameters for the {@link BatteryStatsManager#getBatteryUsageStats()} call.
@@ -196,7 +197,24 @@ public final class BatteryUsageStatsQuery implements Parcelable { 
        return mAggregatedToTimestamp;

    }



    @Override

    public String toString() {

        return "BatteryUsageStatsQuery{"

                + "mFlags=" + Integer.toHexString(mFlags)

                + ", mUserIds=" + Arrays.toString(mUserIds)

                + ", mMaxStatsAgeMs=" + mMaxStatsAgeMs

                + ", mAggregatedFromTimestamp=" + mAggregatedFromTimestamp

                + ", mAggregatedToTimestamp=" + mAggregatedToTimestamp

                + ", mMonotonicStartTime=" + mMonotonicStartTime

                + ", mMonotonicEndTime=" + mMonotonicEndTime

                + ", mMinConsumedPowerThreshold=" + mMinConsumedPowerThreshold

                + ", mPowerComponents=" + Arrays.toString(mPowerComponents)

                + '}';

    }



    private BatteryUsageStatsQuery(Parcel in) {

        mMonotonicStartTime = in.readLong();

        mMonotonicEndTime = in.readLong();

        mFlags = in.readInt();

        mUserIds = new int[in.readInt()];

        in.readIntArray(mUserIds);
@@ -209,6 +227,8 @@ public final class BatteryUsageStatsQuery implements Parcelable { 


    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeLong(mMonotonicStartTime);

        dest.writeLong(mMonotonicEndTime);

        dest.writeInt(mFlags);

        dest.writeInt(mUserIds.length);

        dest.writeIntArray(mUserIds);

core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_ltr.9.png

0 → 100644
+114 B
Loading image diff...

core/tests/batterystatstests/BatteryStatsViewer/res/drawable-mdpi/border_tr.9.png

0 → 100644
+108 B
Loading image diff...

core/tests/batterystatstests/BatteryStatsViewer/res/drawable/power_other_24.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportHeight="960"

    android:viewportWidth="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M720,600L720,520L800,520Q817,520 828.5,531.5Q840,543 840,560Q840,577 828.5,588.5Q817,600 800,600L720,600ZM720,760L720,680L800,680Q817,680 828.5,691.5Q840,703 840,720Q840,737 828.5,748.5Q817,760 800,760L720,760ZM560,800Q527,800 503.5,776.5Q480,753 480,720L400,720L400,560L480,560Q480,527 503.5,503.5Q527,480 560,480L680,480L680,800L560,800ZM280,680Q214,680 167,633Q120,586 120,520Q120,454 167,407Q214,360 280,360L340,360Q365,360 382.5,342.5Q400,325 400,300Q400,275 382.5,257.5Q365,240 340,240L200,240Q183,240 171.5,228.5Q160,217 160,200Q160,183 171.5,171.5Q183,160 200,160L340,160Q398,160 439,201Q480,242 480,300Q480,358 439,399Q398,440 340,440L280,440Q247,440 223.5,463.5Q200,487 200,520Q200,553 223.5,576.5Q247,600 280,600L360,600L360,680L280,680Z" />

</vector>
 
 No newline at end of file

core/tests/batterystatstests/BatteryStatsViewer/res/drawable/screen_off_24.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportHeight="960"

    android:viewportWidth="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z" />

</vector>
 
 No newline at end of file