PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "improve_battery_usage" into main

Browse Source 
* changes:
  [Expressive Battery] Implement the expressive style for anomaly hint chip
  [Expressive Battery] Refactor pref with anomaly hint.
This commit is contained in:
Xinyi Mao
2025-02-13 00:32:59 -08:00
committed by Android (Google) Code Review
parent 29a46cef81 4f9e8cb751
commit a000daad53
15 changed files with 284 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/power_anomaly_hints.xml
View File

@@ -17,13 +17,12 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical|start"
android:padding="8dp"
android:background="@drawable/battery_hints_chip_bg_ripple">
android:id="@+id/warning_chip"
android:padding="8dp">
<ImageView
android:layout_width="16dp"

49
res/layout/power_usage_time.xml
View File

@@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2023 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="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical">
<TextView
android:id="@+id/time_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/time_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="4dp"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
<include layout="@layout/power_anomaly_hints"
android:visibility="gone"
android:id="@+id/anomaly_hints"
android:paddingBottom="20dp"/>
</LinearLayout>

9
res/layout/anomaly_app_item_preference.xml → res/layout/warning_frame_preference.xml
View File

@@ -22,7 +22,7 @@
<include layout="@layout/preference_app"/>
<LinearLayout
android:id="@+id/warning_chip"
android:id="@+id/warning_chip_frame"
android:visibility="gone"
android:clickable="false"
android:layout_width="match_parent"
@@ -32,13 +32,12 @@
android:orientation="horizontal"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<Space
android:id="@+id/warning_padding_placeholder"
android:layout_width="@dimen/secondary_app_icon_size"
android:layout_height="wrap_content"
android:layout_height="1px"
android:layout_marginEnd="16dp"/>
<include layout="@layout/power_anomaly_hints" />
<include layout="@layout/power_anomaly_hints"/>
</LinearLayout>
</LinearLayout>