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

Commit 22677304 authored by Alexander Roederer's avatar Alexander Roederer Committed by Android (Google) Code Review
Browse files

Merge "Remove the ZenModeSliceBuilder" into main

parents 221a8852 3d0dcda0

src/com/android/settings/slices/SettingsSliceProvider.java

+15 −2
Original line number Diff line number Diff line
@@ -120,6 +120,16 @@ public class SettingsSliceProvider extends SliceProvider { 
     * permission can use them.

     */

    private static final List<Uri> PUBLICLY_SUPPORTED_CUSTOM_SLICE_URIS =

            android.app.Flags.modesUi()

                    ?

                    Arrays.asList(

                            CustomSliceRegistry.BLUETOOTH_URI,

                            CustomSliceRegistry.FLASHLIGHT_SLICE_URI,

                            CustomSliceRegistry.LOCATION_SLICE_URI,

                            CustomSliceRegistry.MOBILE_DATA_SLICE_URI,

                            CustomSliceRegistry.WIFI_CALLING_URI,

                            CustomSliceRegistry.WIFI_SLICE_URI

                    ) :

            Arrays.asList(

                    CustomSliceRegistry.BLUETOOTH_URI,

                    CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
@@ -184,7 +194,9 @@ public class SettingsSliceProvider extends SliceProvider { 
        }



        if (CustomSliceRegistry.ZEN_MODE_SLICE_URI.equals(sliceUri)) {

            if (!android.app.Flags.modesUi()) {

                registerIntentToUri(ZenModeSliceBuilder.INTENT_FILTER, sliceUri);

            }

            return;

        } else if (CustomSliceRegistry.BLUETOOTH_URI.equals(sliceUri)) {

            registerIntentToUri(BluetoothSliceBuilder.INTENT_FILTER, sliceUri);
@@ -256,7 +268,8 @@ public class SettingsSliceProvider extends SliceProvider { 
                        .getSlicesFeatureProvider()

                        .getNewWifiCallingSliceHelper(getContext())

                        .createWifiCallingSlice(sliceUri);

            } else if (CustomSliceRegistry.ZEN_MODE_SLICE_URI.equals(sliceUri)) {

            } else if (!android.app.Flags.modesUi()

                    && CustomSliceRegistry.ZEN_MODE_SLICE_URI.equals(sliceUri)) {

                return ZenModeSliceBuilder.getSlice(getContext());

            } else if (CustomSliceRegistry.BLUETOOTH_URI.equals(sliceUri)) {

                return BluetoothSliceBuilder.getSlice(getContext());

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

+12 −7
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -131,7 +130,13 @@ public class SettingsSliceProviderTest { 
            CustomSliceRegistry.LOCATION_SLICE_URI

    );



    private static final List<Uri> SPECIAL_CASE_OEM_URIS = Arrays.asList(

    private static final List<Uri> SPECIAL_CASE_OEM_URIS = android.app.Flags.modesUi()

            ? Arrays.asList(

                    CustomSliceRegistry.FLASHLIGHT_SLICE_URI,

                    CustomSliceRegistry.MOBILE_DATA_SLICE_URI,

                    CustomSliceRegistry.WIFI_CALLING_URI

            ) :

            Arrays.asList(

                CustomSliceRegistry.ZEN_MODE_SLICE_URI,

                CustomSliceRegistry.FLASHLIGHT_SLICE_URI,

                CustomSliceRegistry.MOBILE_DATA_SLICE_URI,