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

Commit 51967c0e authored by jackqdyulei's avatar jackqdyulei
Browse files

Add BatteryMeterView in Settings 

1. Show gauge icon at the top of battery main page instead of
battery usage graph.
2. Move the click action from battery usage graph to gauge icon.

Bug: 34387464
Test: RunSettingsRoboTest

Change-Id: Ib182619d6805b401cde03a50e2ae907cf4df7b94
parent 3fca717d

res/layout/battery_header.xml

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

<!--

  Copyright (C) 2017 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:id="@+id/app_snippet"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:orientation="horizontal"

    android:paddingTop="24dp"

    android:paddingBottom="24dp"

    style="@style/EntityHeader">



    <com.android.settings.fuelgauge.BatteryMeterView

        android:id="@+id/battery_header_icon"

        android:layout_width="@dimen/battery_meter_width"

        android:layout_height="@dimen/battery_meter_height"/>



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="12dp"

        android:layout_marginEnd="12dp"

        android:orientation="vertical">



        <TextView

            android:id="@+id/time"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            android:gravity="center"

            android:textAppearance="@android:style/TextAppearance.Material.Medium"/>



        <TextView

            android:id="@+id/summary1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            android:gravity="center"

            android:textAppearance="@android:style/TextAppearance.Material.Small"

            android:text="@string/estimated_time_left"/>



        <TextView

            android:id="@+id/summary2"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            android:gravity="center"

            android:textAppearance="@android:style/TextAppearance.Material.Small"

            android:text="@string/estimated_time_description"/>



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -311,4 +311,8 @@ 


    <!-- Padding between the donut and the storage summary. -->

    <dimen name="storage_summary_padding_end">16dp</dimen>



    <!-- Battery meter view size -->

    <dimen name="battery_meter_width">66dp</dimen>

    <dimen name="battery_meter_height">100dp</dimen>

</resources>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -4478,6 +4478,12 @@ 
    <!-- Description for battery usage detail information since last full charge. [CHAR LIMIT=120] -->

    <string name="battery_detail_since_full_charge">Usage breakdown since last full charge</string>













    <!-- Description for battery time left, i.e. 50min Estimated time left. [CHAR LIMIT=80]-->













    <string name="estimated_time_left">Estimated time left</string>

























    <!-- Description for estimated time. [CHAR LIMIT=80]-->













    <string name="estimated_time_description">Estimation may change based on usage</string>



























    <!-- Menu label for viewing battery usage since unplugged -->















    <string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> since unplugged</string>















    <!-- Menu label for viewing battery usage since unplugged -->

































res/xml/account_type_settings.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -38,6 +38,7 @@













    <com.android.settings.applications.LayoutPreference















      android:key="remove_account"















      android:layout="@layout/remove_account_button"













      android:order="100" />













      android:order="100"













      android:selectable="false"/>































</PreferenceScreen>
























res/xml/app_storage_settings.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -30,6 +30,7 @@





























    <com.android.settings.applications.LayoutPreference















        android:key="change_storage_button"













        android:selectable="false"















        android:layout="@layout/single_button_panel" />































    <PreferenceCategory










@@ -69,6 +70,7 @@





























        <com.android.settings.applications.LayoutPreference















            android:key="clear_data_button"













            android:selectable="false"















            android:layout="@layout/single_button_panel" />















    </PreferenceCategory>