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

Commit 42f0193b authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev am: 270b7ef1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24124246



Change-Id: I657cab61453b5f7708fcf305d1a9611d3022c4d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50589352 270b7ef1

res/drawable/battery_tips_all_rounded_bg.xml

0 → 100644
+22 −0
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.

  -->



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

    android:shape="rectangle">

    <solid android:color="@color/settingslib_dialog_background" />

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

</shape>
 
 No newline at end of file

res/drawable/battery_tips_half_rounded_bottom_bg.xml

0 → 100644
+27 −0
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.

  -->



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

    android:shape="rectangle">

    <solid android:color="@color/settingslib_dialog_background"/>

    <corners

        android:topLeftRadius="@dimen/battery_tips_card_corner_radius_small"

        android:topRightRadius="@dimen/battery_tips_card_corner_radius_small"

        android:bottomLeftRadius="@dimen/battery_tips_card_corner_radius_normal"

        android:bottomRightRadius="@dimen/battery_tips_card_corner_radius_normal"

        />

</shape>
 
 No newline at end of file

res/drawable/battery_tips_half_rounded_top_bg.xml

0 → 100644
+27 −0
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.

  -->



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

    android:shape="rectangle">

    <solid android:color="@color/settingslib_dialog_background"/>

    <corners

        android:topLeftRadius="@dimen/battery_tips_card_corner_radius_normal"

        android:topRightRadius="@dimen/battery_tips_card_corner_radius_normal"

        android:bottomLeftRadius="@dimen/battery_tips_card_corner_radius_small"

        android:bottomRightRadius="@dimen/battery_tips_card_corner_radius_small"

        />

</shape>
 
 No newline at end of file

res/drawable/ic_battery_tips_close.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  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.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="?android:attr/textColorSecondary"

        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z"/>

</vector>

res/drawable/ic_battery_tips_close_icon.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<!--

  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.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp">

    <item>

        <shape android:shape="oval">

            <size

                android:width="24dp"

                android:height="24dp" />

            <solid android:color="?android:attr/colorBackground" />

        </shape>

    </item>

    <item android:drawable="@drawable/ic_battery_tips_close"

        android:gravity="center"

        android:width="16dp"

        android:height="16dp"/>

</layer-list>
 
 No newline at end of file