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

Commit a000daad authored by Xinyi Mao's avatar Xinyi Mao Committed by Android (Google) Code Review
Browse files

Merge changes from topic "improve_battery_usage" into main 

* changes:
  [Expressive Battery] Implement the expressive style for anomaly hint chip
  [Expressive Battery] Refactor pref with anomaly hint.
parents 29a46cef 4f9e8cb7

res/drawable-v35/expressive_battery_hints_chip_bg.xml

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

<!--

  ~ Copyright (C) 2025 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.

  -->



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

    android:shape="rectangle">

    <corners android:radius="@dimen/settingslib_expressive_radius_medium" />

    <stroke android:width="1dp" android:color="@color/settingslib_materialColorOutline" />

</shape>
 
 No newline at end of file

res/drawable-v35/expressive_battery_hints_chip_bg_ripple.xml

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

<!--

  ~ Copyright (C) 2025 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.

  -->



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

    android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@drawable/expressive_battery_hints_chip_bg"/>

</ripple>
 
 No newline at end of file

res/layout-v35/expressive_warning_frame_preference.xml

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

  ~ Copyright (C) 2025 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:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:orientation="vertical">



    <include layout="@layout/settingslib_expressive_preference"

        android:id="@+id/preference_frame"/>



    <LinearLayout

        android:id="@+id/warning_chip_frame"

        android:visibility="gone"

        android:clickable="false"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/settingslib_expressive_space_small1"

        android:layout_marginTop="-8dp">

        <Space

            android:id="@+id/warning_padding_placeholder"

            android:layout_width="@dimen/settingslib_expressive_space_medium3"

            android:layout_height="1px"

            android:layout_marginEnd="@dimen/settingslib_expressive_space_extrasmall6"/>



        <include layout="@layout/power_anomaly_hints"/>

    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/layout/power_anomaly_hints.xml

+2 −3
Original line number Diff line number Diff line
@@ -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"

res/layout/power_usage_time.xml

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
<?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>
 
 No newline at end of file