273ad50a3a
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer
Also update the method name in test file, and this ui changes
also fix the header flash problem.
Bug: 36576021
Bug: 36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
(cherry picked from commit edfd09d590)
61 lines
2.2 KiB
XML
61 lines
2.2 KiB
XML
<?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"
|
|
android:background="@drawable/selectable_card_grey"
|
|
style="@style/EntityHeader">
|
|
|
|
<LinearLayout
|
|
android:layout_width="216dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="48dp"
|
|
android:layout_marginEnd="12dp"
|
|
android:orientation="vertical">
|
|
|
|
<TextView
|
|
android:id="@+id/battery_percent"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="12dp"
|
|
android:textAppearance="@android:style/TextAppearance.Material.Display1"/>
|
|
|
|
<TextView
|
|
android:id="@+id/summary1"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="12dp"
|
|
android:textAppearance="@android:style/TextAppearance.Material.Small"
|
|
android:text="@string/estimated_time_left"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<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"
|
|
android:layout_gravity="end"
|
|
android:layout_marginEnd="24dp"/>
|
|
|
|
</LinearLayout> |