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

Commit 8d397f03 authored by Matías Hernández's avatar Matías Hernández
Browse files

Add icon picker for zen modes 

Bug: 333901673
Test: atest ZenModeIconPickerListPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: Ib6faaac7c93b25423d18dbdcd0a2310de15fa86f
parent b04e2d46

res/drawable/ic_zen_mode_action_change_icon.xml

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

Copyright (C) 2024 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:tint="?android:attr/colorControlNormal"

    android:viewportHeight="960"

    android:viewportWidth="960">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M620,440Q645,440 662.5,422.5Q680,405 680,380Q680,355 662.5,337.5Q645,320 620,320Q595,320 577.5,337.5Q560,355 560,380Q560,405 577.5,422.5Q595,440 620,440ZM340,440Q365,440 382.5,422.5Q400,405 400,380Q400,355 382.5,337.5Q365,320 340,320Q315,320 297.5,337.5Q280,355 280,380Q280,405 297.5,422.5Q315,440 340,440ZM480,700Q548,700 603.5,661.5Q659,623 684,560L276,560Q301,623 356.5,661.5Q412,700 480,700ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Z" />

</vector>
 
 No newline at end of file

res/layout/modes_icon_list.xml

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

<!--

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

-->





<androidx.constraintlayout.widget.ConstraintLayout

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/icon_list"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:clipToPadding="true"

        android:nestedScrollingEnabled="false"

        android:paddingStart="12dp"

        android:paddingEnd="12dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"/>



</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file

res/layout/modes_icon_list_item.xml

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

<!--

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

-->



<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/zen_mode_icon_list_item_size"

    android:clickable="true">

    <!-- width is match_parent to distribute remaining horizontal space -->



    <ImageView

        android:id="@+id/icon_image_view"

        android:layout_width="@dimen/zen_mode_icon_list_circle_diameter"

        android:layout_height="@dimen/zen_mode_icon_list_circle_diameter"

        android:importantForAccessibility="no"

        android:layout_gravity="center" />

</FrameLayout>

res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -491,4 +491,9 @@ 


    <dimen name="audio_streams_qrcode_size">264dp</dimen>

    <dimen name="audio_streams_qrcode_preview_radius">30dp</dimen>



    <!-- Zen Modes -->

    <dimen name="zen_mode_icon_list_item_size">96dp</dimen>

    <dimen name="zen_mode_icon_list_circle_diameter">56dp</dimen>

    <dimen name="zen_mode_icon_list_icon_size">32dp</dimen>

</resources>

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -9309,6 +9309,15 @@ 
    <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->

    <string name="zen_mode_summary_always">Change to always interrupt</string>













    <!-- [CHAR LIMIT=20] Caption of the action button to change the name of a mode. -->













    <string name="zen_mode_action_change_name">Rename</string>

























    <!-- [CHAR LIMIT=20] Caption of the action button to change the icon of a mode. -->













    <string name="zen_mode_action_change_icon">Change icon</string>

























    <!-- [CHAR LIMIT=40] Zen mode settings: Title for the "choose mode icon" screen -->













    <string name="zen_mode_icon_picker_title">Change icon</string>



























    <!-- Content description for help icon button [CHAR LIMIT=20] -->















    <string name="warning_button_text">Warning</string>