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

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

Change sort order of modes list 

Before: DND, alphabetical
Now: DND, Bedtime, Driving, alphabetical

Fixes: 360358566
Test: atest ZenModeTest
Flag: android.app.modes_ui
Change-Id: I44b4cedca43d4cea9215f10f0e95eb4b65785026
parent 9e701690

packages/SettingsLib/src/com/android/settingslib/notification/modes/ZenMode.java

+29 −0
Original line number Diff line number Diff line
@@ -52,9 +52,11 @@ import androidx.annotation.Nullable; 
import com.android.settingslib.R;



import com.google.common.base.Strings;

import com.google.common.collect.ImmutableList;

import com.google.common.util.concurrent.Futures;

import com.google.common.util.concurrent.ListenableFuture;



import java.util.Comparator;

import java.util.Objects;



/**
@@ -87,6 +89,33 @@ public class ZenMode implements Parcelable { 
                    .allowPriorityChannels(false)

                    .build();



    private static final Comparator<Integer> PRIORITIZED_TYPE_COMPARATOR = new Comparator<>() {



        private static final ImmutableList</* @AutomaticZenRule.Type */ Integer>

                PRIORITIZED_TYPES = ImmutableList.of(

                        AutomaticZenRule.TYPE_BEDTIME,

                        AutomaticZenRule.TYPE_DRIVING);



        @Override

        public int compare(Integer first, Integer second) {

            if (PRIORITIZED_TYPES.contains(first) && PRIORITIZED_TYPES.contains(second)) {

                return PRIORITIZED_TYPES.indexOf(first) - PRIORITIZED_TYPES.indexOf(second);

            } else if (PRIORITIZED_TYPES.contains(first)) {

                return -1;

            } else if (PRIORITIZED_TYPES.contains(second)) {

                return 1;

            } else {

                return 0;

            }

        }

    };



    // Manual DND first, Bedtime/Driving, then alphabetically.

    static final Comparator<ZenMode> PRIORITIZING_COMPARATOR = Comparator

            .comparing(ZenMode::isManualDnd).reversed()

            .thenComparing(ZenMode::getType, PRIORITIZED_TYPE_COMPARATOR)

            .thenComparing(ZenMode::getName);



    public enum Status {

        ENABLED,

        ENABLED_AND_ACTIVE,

packages/SettingsLib/src/com/android/settingslib/notification/modes/ZenModesBackend.java

+1 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.settingslib.R; 


import java.time.Duration;

import java.util.ArrayList;

import java.util.Comparator;

import java.util.List;

import java.util.Map;
@@ -92,10 +91,7 @@ public class ZenModesBackend { 
            }

        }



        // Manual DND first, then alphabetically.

        modes.sort(Comparator.comparing(ZenMode::isManualDnd).reversed()

                .thenComparing(ZenMode::getName));



        modes.sort(ZenMode.PRIORITIZING_COMPARATOR);

        return modes;

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/modes/ZenModeTest.java

+32 −1
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package com.android.settingslib.notification.modes;



import static android.app.AutomaticZenRule.TYPE_BEDTIME;

import static android.app.AutomaticZenRule.TYPE_DRIVING;

import static android.app.AutomaticZenRule.TYPE_IMMERSIVE;

import static android.app.AutomaticZenRule.TYPE_OTHER;

import static android.app.AutomaticZenRule.TYPE_THEATER;

import static android.app.AutomaticZenRule.TYPE_UNKNOWN;

import static android.app.NotificationManager.INTERRUPTION_FILTER_ALARMS;

import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;

import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
@@ -37,6 +43,9 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;



import java.util.ArrayList;

import java.util.List;



@RunWith(RobolectricTestRunner.class)

public class ZenModeTest {
@@ -45,7 +54,7 @@ public class ZenModeTest { 
    private static final AutomaticZenRule ZEN_RULE =

            new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))

                    .setPackage("com.some.driving.thing")

                    .setType(AutomaticZenRule.TYPE_DRIVING)

                    .setType(TYPE_DRIVING)

                    .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)

                    .setZenPolicy(ZEN_POLICY)

                    .build();
@@ -223,6 +232,28 @@ public class ZenModeTest { 
        assertThat(zenMode.getRule().getZenPolicy()).isEqualTo(ZEN_POLICY);

    }



    @Test

    public void comparator_prioritizes() {

        ZenMode manualDnd = TestModeBuilder.MANUAL_DND_INACTIVE;

        ZenMode driving1 = new TestModeBuilder().setName("b1").setType(TYPE_DRIVING).build();

        ZenMode driving2 = new TestModeBuilder().setName("b2").setType(TYPE_DRIVING).build();

        ZenMode bedtime1 = new TestModeBuilder().setName("c1").setType(TYPE_BEDTIME).build();

        ZenMode bedtime2 = new TestModeBuilder().setName("c2").setType(TYPE_BEDTIME).build();

        ZenMode other = new TestModeBuilder().setName("a1").setType(TYPE_OTHER).build();

        ZenMode immersive = new TestModeBuilder().setName("a2").setType(TYPE_IMMERSIVE).build();

        ZenMode unknown = new TestModeBuilder().setName("a3").setType(TYPE_UNKNOWN).build();

        ZenMode theater = new TestModeBuilder().setName("a4").setType(TYPE_THEATER).build();



        ArrayList<ZenMode> list = new ArrayList<>(List.of(other, theater, bedtime1, unknown,

                driving2, manualDnd, driving1, bedtime2, immersive));

        list.sort(ZenMode.PRIORITIZING_COMPARATOR);



        assertThat(list)

                .containsExactly(manualDnd, bedtime1, bedtime2, driving1, driving2, other,

                        immersive, unknown, theater)

                .inOrder();

    }



    @Test

    public void writeToParcel_equals() {

        assertUnparceledIsEqualToOriginal("example",