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

Commit 2bd1799f authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Migrate people settings to new modes UI 

Flag: android.app.modes_ui
Bug: 337079247
Test: make -j RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.notification.modes
Change-Id: If5e7b82a006e856b4aceca7acdfc8cc0d11092a7
parent f60595d0

res/xml/modes_calls_settings.xml

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

-->



<PreferenceScreen

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

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

    android:key="zen_mode_calls_settings_page"

    settings:searchable="false"

    android:title="@string/zen_mode_calls_title">



    <PreferenceCategory

        android:key="zen_mode_settings_category_calls"

        android:title="@string/zen_mode_calls_header"

        settings:allowDividerBelow="true">

    </PreferenceCategory>



    <!-- Repeat callers -->

    <SwitchPreferenceCompat

        android:key="zen_mode_repeat_callers"

        android:title="@string/zen_mode_repeat_callers_title"

        settings:allowDividerAbove="true"/>



</PreferenceScreen>

res/xml/modes_messages_settings.xml

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

-->



<PreferenceScreen

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

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

    android:key="zen_mode_messages_settings_page"

    settings:searchable="false"

    android:title="@string/zen_mode_messages_title" >



    <PreferenceCategory

        android:key="zen_mode_settings_category_messages"

        android:title="@string/zen_mode_messages_header">

    </PreferenceCategory>

</PreferenceScreen>

res/xml/modes_people_settings.xml

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

-->



<PreferenceScreen

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

    android:title="@string/zen_category_people" >



   <!-- Calls & Messages -->

   <PreferenceCategory

       android:key="zen_mode_people_calls_messages_section"

       android:title="@string/zen_mode_people_calls_messages_section_title">



      <Preference

          android:key="zen_mode_people_messages"

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



      <Preference

          android:key="zen_mode_people_calls"

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

   </PreferenceCategory>

</PreferenceScreen>

res/xml/modes_rule_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,4 +22,8 @@ 
            android:key="header"

            android:layout="@layout/settings_entity_header" />



    <Preference

            android:key="zen_mode_people"

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



</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/notification/modes/ZenModeCallsFragment.java

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

 */



package com.android.settings.notification.modes;



import android.app.settings.SettingsEnums;

import android.content.Context;

import com.android.settings.R;

import com.android.settingslib.core.AbstractPreferenceController;



import java.util.ArrayList;

import java.util.List;



/**

 * DND Calls Settings page to determine which priority senders can bypass DND when this mode is

 * activated.

 */

public class ZenModeCallsFragment extends ZenModeFragmentBase {



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new ZenModePrioritySendersPreferenceController(context,

                "zen_mode_settings_category_calls", false, mBackend));

        controllers.add(new ZenModeRepeatCallersPreferenceController(context,

                "zen_mode_repeat_callers", mBackend,

                context.getResources().getInteger(com.android.internal.R.integer

                        .config_zen_repeat_callers_threshold)));

        return controllers;

    }



    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.modes_calls_settings;

    }



    @Override

    public int getMetricsCategory() {

        // TODO: b/332937635 - make this the correct metrics category

        return SettingsEnums.DND_CALLS;

    }



    @Override

    public void onResume() {

        super.onResume();

        use(ZenModePrioritySendersPreferenceController.class).onResume();

    }

}