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

Commit ef0c05a2 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Fix BatteryStatsViewer layout issues" into main

parents 8e0318b4 1fb9b832

core/tests/batterystatstests/BatteryStatsViewer/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ 


    <application

        android:theme="@style/Theme"

        android:icon="@mipmap/ic_launcher"

        android:roundIcon="@mipmap/ic_launcher_round"

        android:label="Battery Stats Viewer">

        <activity android:name=".BatteryConsumerPickerActivity"

                  android:label="Battery Stats"

                  android:icon="@mipmap/ic_launcher"

                  android:launchMode="singleTop"

                  android:exported="true">

            <intent-filter>

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

deleted100644 → 0
+0 −170
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

    <path

        android:fillColor="#3DDC84"

        android:pathData="M0,0h108v108h-108z" />

    <path

        android:fillColor="#00000000"

        android:pathData="M9,0L9,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19,0L19,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M29,0L29,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M39,0L39,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M49,0L49,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M59,0L59,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M69,0L69,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M79,0L79,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M89,0L89,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M99,0L99,108"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,9L108,9"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,19L108,19"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,29L108,29"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,39L108,39"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,49L108,49"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,59L108,59"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,69L108,69"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,79L108,79"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,89L108,89"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M0,99L108,99"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19,29L89,29"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19,39L89,39"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19,49L89,49"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19,59L89,59"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19,69L89,69"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19,79L89,79"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M29,19L29,89"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M39,19L39,89"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M49,19L49,89"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M59,19L59,89"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M69,19L69,89"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

    <path

        android:fillColor="#00000000"

        android:pathData="M79,19L79,89"

        android:strokeWidth="0.8"

        android:strokeColor="#33FFFFFF" />

</vector>

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

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

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

    <path

        android:fillType="evenOdd"

        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,

        49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"

        android:strokeWidth="1"

        android:strokeColor="#00000000">

        <aapt:attr name="android:fillColor">

            <gradient

                android:endX="78.5885"

                android:endY="90.9159"

                android:startX="48.7653"

                android:startY="61.0927"

                android:type="linear">

                <item

                    android:color="#44000000"

                    android:offset="0.0" />

                <item

                    android:color="#00000000"

                    android:offset="1.0" />

            </gradient>

        </aapt:attr>

    </path>

    <path

        android:fillColor="#FFFFFF"

        android:fillType="nonZero"

        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,

        50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,

        37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,

        42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,

        40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,

        52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,

        56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,

        52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"

        android:strokeWidth="1"

        android:strokeColor="#00000000" />

</vector>

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/swipe_refresh"

    android:paddingTop="?attr/actionBarSize"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

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

+2 −0
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/swipe_refresh"

    android:paddingTop="?attr/actionBarSize"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        android:orientation="vertical"

        android:paddingTop="?attr/actionBarSize"

        android:layout_width="match_parent"

        android:layout_height="match_parent">