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

Commit a58e52a0 authored by Beverly's avatar Beverly
Browse files

Added zen settings messages and calls preferences. 

- Made ZenModeSettings and ZenModeBehaviorSettings a DashboardFragment
- Switches in ZenModeBehaviorSettings all have their own preference controllers
- Instead of a dropdown, messages & calls have their own pages & preference controllers
- Added basic turn on/off DND button in settings (dialog not yet implemented)

Bug: 63077372
Fixes: 69057767
Test: make -j40 RunSettingsRoboTests
Change-Id: I1c70f77053713f66f873ee578477f23cfd7985bb
parent a40f6a2a

res/layout/zen_mode_button.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?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:orientation="horizontal"

    android:gravity="bottom"

    android:paddingTop="4dp"

    android:paddingStart="72dp"

    android:paddingEnd="72dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <Button

        android:id="@+id/zen_mode_button"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:paddingEnd="8dp" />



</LinearLayout>
 
 No newline at end of file

res/layout/zen_mode_settings_button.xml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?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:orientation="horizontal"

    android:gravity="bottom"

    android:paddingTop="4dp"

    android:paddingStart="72dp"

    android:paddingEnd="72dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <Button

        android:id="@+id/zen_mode_settings_turn_on_button"

        style="@style/ActionPrimaryButton"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:text="@string/zen_mode_button_turn_on"

        android:paddingEnd="8dp" />



    <Button

        android:id="@+id/zen_mode_settings_turn_off_button"

        style="@style/ActionSecondaryButton"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:text="@string/zen_mode_button_turn_off"

        android:paddingEnd="8dp" />



</LinearLayout>
 
 No newline at end of file

res/values/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -1031,4 +1031,18 @@ 
        <item>never</item>

    </string-array>



    <string-array name="zen_mode_contacts_entries" translatable="false">

        <item>@string/zen_mode_from_anyone</item>

        <item>@string/zen_mode_from_contacts</item>

        <item>@string/zen_mode_from_starred</item>

        <item>@string/zen_mode_from_none</item>

    </string-array>



    <string-array name="zen_mode_contacts_values" translatable="false">

        <item>zen_mode_from_anyone</item>

        <item>zen_mode_from_contacts</item>

        <item>zen_mode_from_starred</item>

        <item>zen_mode_from_none</item>

    </string-array>



</resources>

res/values/strings.xml

+21 −0
Original line number Diff line number Diff line
@@ -6754,6 +6754,27 @@ 
    <!--  Do not disturb: Button to add new automatic rule to DND. [CHAR LIMIT=30] -->

    <string name="zen_mode_add">Add</string>









    <!--  Do not disturb: Label for button that will turn on zen mode. [CHAR LIMIT=30] -->









    <string name="zen_mode_button_turn_on">TURN ON NOW</string>

















    <!--  Do not disturb: Label for button that will turn off zen mode. [CHAR LIMIT=30] -->









    <string name="zen_mode_button_turn_off">TURN OFF NOW</string>

















    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing end time of DND -->









    <string name="zen_mode_settings_dnd_manual_end_time_next_day">Do Not Disturb is on until <xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g></string>

















    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing length of DND -->









    <string name="zen_mode_settings_dnd_manual_indefinite">Do Not Disturb will stay on until you turn it off.</string>

















    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing how DND was triggered by an automatic DND rule -->









    <string name="zen_mode_settings_dnd_automatic_rule">Do Not Disturb was automatically turned on by a rule <xliff:g id="rule_name" example="Weeknights">%s</xliff:g></string>

















    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer how DND was triggered by an app -->









    <string name="zen_mode_settings_dnd_automatic_rule_app">Do Not Disturb was automatically turned on by an app <xliff:g id="app_name" example="Pixel Services">%s</xliff:g></string>

















    <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer how DND was triggered by multiple rules and/or apps -->









    <string name="zen_mode_settings_dnd_automatic_rule_multiple">Do Not Disturb was automatically turned on by a rule or app</string>

















    <!-- Work Sounds: Work sound settings section header.  [CHAR LIMIT=50] -->









    <string name="sound_work_settings">Work profile sounds</string>

































res/xml/zen_mode_automation_settings.xml



+11
−1






























Original line number
Diff line number
Diff line







@@ -19,5 +19,15 @@







                  android:key="zen_mode_automation_settings_page"









                  android:title="@string/zen_mode_automation_settings_page_title" >





























    <PreferenceCategory









        android:key="zen_mode_automatic_rules">









        <!-- Rules added at runtime -->









    </PreferenceCategory>



















    <Preference









        android:key="zen_mode_add_automatic_rule"









        android:icon="@drawable/ic_menu_add"









        android:title="@string/zen_mode_add_rule"/>



















</PreferenceScreen>