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

Commit 54fc08e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "BatteryStatsViewer UI improvements:" into sc-dev

parents 85e554b8 00b667a6

core/tests/batterystatstests/BatteryStatsViewer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ android_app { 
        "androidx.appcompat_appcompat",

        "androidx.cardview_cardview",

        "androidx.recyclerview_recyclerview",

        "androidx.swiperefreshlayout_swiperefreshlayout",

        "com.google.android.material_material",

    ],

    platform_apis: true,

core/tests/batterystatstests/BatteryStatsViewer/res/drawable/gm_sum_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="M19,4H5v2l6,6 -6,6v2h14v-3h-9l5,-5 -5,-5h9V4z"/>

</vector>

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

+4 −3
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginEnd="8dp"/>

        android:layout_marginEnd="8dp"

        android:paddingBottom="8dp"/>



    <TextView

        android:id="@+id/title"
@@ -40,7 +41,7 @@ 
        android:textAppearance="@style/TextAppearanceBody"/>



    <TextView

        android:id="@+id/amount"

        android:id="@+id/value1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="8dp"
@@ -49,7 +50,7 @@ 
        android:textAppearance="@style/TextAppearanceBody"/>



    <TextView

        android:id="@+id/percent"

        android:id="@+id/value2"

        android:layout_width="76dp"

        android:layout_height="wrap_content"

        android:gravity="right"

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

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:orientation="vertical">



    <com.google.android.material.tabs.TabLayout

        android:id="@+id/tab_layout"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>



    <androidx.viewpager.widget.ViewPager

        android:id="@+id/pager"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />



</LinearLayout>

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

+4 −11
Original line number Diff line number Diff line
@@ -14,22 +14,15 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<FrameLayout

<androidx.swiperefreshlayout.widget.SwipeRefreshLayout

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

    android:id="@+id/swipe_refresh"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/list_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"/>

        android:layout_height="match_parent"/>



    <ProgressBar

        style="?android:attr/progressBarStyleLarge"

        android:id="@+id/loading_view"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:indeterminate="true"/>

</FrameLayout>
 
 No newline at end of file
 
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>