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

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

Merge "Show all BatteryUsageStats in BatteryStatsViewer" into sc-dev

parents 6e943b54 02973409

core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_amp_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:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="#d14d2c">

  <path

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

      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11.17,19.5h-0.83l0.82,-5.83 -4.18,0.01 5.85,-9.17h0.83l-0.84,5.84h4.17l-5.82,9.15z"/>

</vector>

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

0 → 100644
+25 −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:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="#269e5c">

  <path

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

      android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z"/>

  <path

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

      android:pathData="M6.25,7.72h5v1.5h-5z"/>

  <path

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

      android:pathData="M13,15.75h5v1.5h-5z"/>

  <path

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

      android:pathData="M13,13.25h5v1.5h-5z"/>

  <path

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

      android:pathData="M8,18l1.5,0l0,-2l2,0l0,-1.5l-2,0l0,-2l-1.5,0l0,2l-2,0l0,1.5l2,0z"/>

  <path

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

      android:pathData="M14.09,10.95l1.41,-1.41l1.41,1.41l1.06,-1.06l-1.41,-1.42l1.41,-1.41l-1.06,-1.06l-1.41,1.41l-1.41,-1.41l-1.06,1.06l1.41,1.41l-1.41,1.42z"/>

</vector>

core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_custom_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:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="#d14d2c">

  <path

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

      android:pathData="M22,9L22,7h-2L20,5c0,-1.1 -0.9,-2 -2,-2L4,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2h2v-2h-2L20,9h2zM18,19L4,19L4,5h14v14zM6,13h5v4L6,17v-4zM12,7h4v3h-4L12,7zM6,7h5v5L6,12L6,7zM12,11h4v6h-4v-6z"/>

</vector>

core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_timer_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:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

  <path

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

      android:pathData="M15,3L9,3L9,1h6v2zM11,14h2L13,8h-2v6zM21,13.01c0,4.97 -4.02,9 -9,9s-9,-4.03 -9,-9 4.03,-9 9,-9c2.12,0 4.07,0.74 5.62,1.98l1.42,-1.42c0.51,0.42 0.98,0.9 1.41,1.41L19.03,7.4C20.26,8.93 21,10.89 21,13.01zM19,13.01c0,-3.87 -3.13,-7 -7,-7s-7,3.13 -7,7 3.13,7 7,7 7,-3.13 7,-7z"/>

</vector>

core/tests/batterystatstests/BatteryStatsViewer/res/layout/battery_consumer_entry_layout.xml

+12 −3
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ 
    android:paddingTop="8dp"

    android:paddingBottom="8dp">



    <ImageView

        android:id="@+id/icon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginEnd="8dp"/>



    <TextView

        android:id="@+id/title"

        android:layout_width="0dp"
@@ -34,16 +41,18 @@ 


    <TextView

        android:id="@+id/amount"

        android:layout_width="0dp"

        android:layout_weight="0.7"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="8dp"

        android:gravity="right"

        android:maxLines="1"

        android:textAppearance="@style/TextAppearanceBody"/>



    <TextView

        android:id="@+id/percent"

        android:layout_width="64dp"

        android:layout_width="76dp"

        android:layout_height="wrap_content"

        android:gravity="right"

        android:maxLines="1"

        android:textAppearance="@style/TextAppearanceBody"/>

</LinearLayout>