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

Commit b05af56a authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "DND should be displayed on search as slice." into qt-dev

parents 02576b6e bae490bc

res/xml/sound_settings.xml

+14 −14
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
        settings:useAdminDisabledSummary="true"

        settings:keywords="@string/keywords_sounds_and_notifications_interruptions"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.notification.ZenModePreferenceController" />

        settings:controller="com.android.settings.notification.ZenModeSoundSettingsPreferenceController"/>



    <Preference

        android:key="gesture_prevent_ringing_sound"

src/com/android/settings/notification/ZenModePreferenceController.java

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume; 
public class ZenModePreferenceController extends BasePreferenceController

        implements LifecycleObserver, OnResume, OnPause {





    public static final String ZEN_MODE_KEY = "zen_mode";



    private SettingObserver mSettingObserver;

    private ZenModeSettings.SummaryBuilder mSummaryBuilder;

src/com/android/settings/notification/ZenModeSliceBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.settings.notification; 


import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;



import static com.android.settings.notification.ZenModePreferenceController.ZEN_MODE_KEY;

import static com.android.settings.notification.ZenModeSoundSettingsPreferenceController.ZEN_MODE_KEY;



import android.annotation.ColorInt;

import android.app.NotificationManager;

src/com/android/settings/notification/ZenModeSoundSettingsPreferenceController.java

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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;



import android.content.Context;



public class ZenModeSoundSettingsPreferenceController extends ZenModePreferenceController {



    public static final String ZEN_MODE_KEY = "zen_mode";



    public ZenModeSoundSettingsPreferenceController(Context context, String key) {

        super(context, key);

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.settings.slices; 
import static android.provider.SettingsSlicesContract.KEY_LOCATION;

import static android.provider.SettingsSlicesContract.KEY_WIFI;



import static com.android.settings.notification.ZenModePreferenceController.ZEN_MODE_KEY;

import static com.android.settings.notification.ZenModeSoundSettingsPreferenceController.ZEN_MODE_KEY;



import android.content.ContentResolver;

import android.net.Uri;