DND should be displayed on search as slice.
Add ZenModeSoundSettingsPreferenceController extends ZenModePreferenceController, and update availability status to AVAILABLE. This is cherry-picked from ag/6897872 Change-Id: I8dcb6808cc21c4f5c06548a363c998e369646487 Bug: 129320642 Test: manual & robotests
This commit is contained in:
@@ -103,14 +103,14 @@
|
||||
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"
|
||||
android:title="@string/gesture_prevent_ringing_sound_title"
|
||||
android:order="-110"
|
||||
android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
|
||||
settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController" />
|
||||
settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController"/>
|
||||
|
||||
<!-- Phone ringtone -->
|
||||
<com.android.settings.DefaultRingtonePreference
|
||||
@@ -150,27 +150,27 @@
|
||||
<!-- Dial pad tones -->
|
||||
<SwitchPreference
|
||||
android:key="dial_pad_tones"
|
||||
android:title="@string/dial_pad_tones_title" />
|
||||
android:title="@string/dial_pad_tones_title"/>
|
||||
|
||||
<!-- Screen locking sounds -->
|
||||
<SwitchPreference
|
||||
android:key="screen_locking_sounds"
|
||||
android:title="@string/screen_locking_sounds_title" />
|
||||
android:title="@string/screen_locking_sounds_title"/>
|
||||
|
||||
<!-- Charging sounds -->
|
||||
<SwitchPreference
|
||||
android:key="charging_sounds"
|
||||
android:title="@string/charging_sounds_title" />
|
||||
android:title="@string/charging_sounds_title"/>
|
||||
|
||||
<!-- Docking sounds -->
|
||||
<SwitchPreference
|
||||
android:key="docking_sounds"
|
||||
android:title="@string/docking_sounds_title" />
|
||||
android:title="@string/docking_sounds_title"/>
|
||||
|
||||
<!-- Touch sounds -->
|
||||
<SwitchPreference
|
||||
android:key="touch_sounds"
|
||||
android:title="@string/touch_sounds_title" />
|
||||
android:title="@string/touch_sounds_title"/>
|
||||
|
||||
<!-- Vibrate on touch -->
|
||||
<SwitchPreference
|
||||
@@ -183,18 +183,18 @@
|
||||
<DropDownPreference
|
||||
android:key="dock_audio_media"
|
||||
android:title="@string/dock_audio_media_title"
|
||||
android:summary="%s" />
|
||||
android:summary="%s"/>
|
||||
|
||||
<!-- Boot sounds -->
|
||||
<SwitchPreference
|
||||
android:key="boot_sounds"
|
||||
android:title="@string/boot_sounds_title" />
|
||||
android:title="@string/boot_sounds_title"/>
|
||||
|
||||
<!-- Emergency tone -->
|
||||
<DropDownPreference
|
||||
android:key="emergency_tone"
|
||||
android:title="@string/emergency_tone_title"
|
||||
android:summary="%s" />
|
||||
android:summary="%s"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<com.android.settings.widget.WorkOnlyCategory
|
||||
@@ -207,7 +207,7 @@
|
||||
android:key="work_use_personal_sounds"
|
||||
android:title="@string/work_use_personal_sounds_title"
|
||||
android:summary="@string/work_use_personal_sounds_summary"
|
||||
android:disableDependentsState="true" />
|
||||
android:disableDependentsState="true"/>
|
||||
|
||||
<!-- Work phone ringtone -->
|
||||
<com.android.settings.DefaultRingtonePreference
|
||||
@@ -215,7 +215,7 @@
|
||||
android:title="@string/work_ringtone_title"
|
||||
android:dialogTitle="@string/work_alarm_ringtone_title"
|
||||
android:ringtoneType="ringtone"
|
||||
android:dependency="work_use_personal_sounds" />
|
||||
android:dependency="work_use_personal_sounds"/>
|
||||
|
||||
<!-- Default work notification ringtone -->
|
||||
<com.android.settings.DefaultRingtonePreference
|
||||
@@ -223,7 +223,7 @@
|
||||
android:title="@string/work_notification_ringtone_title"
|
||||
android:dialogTitle="@string/work_alarm_ringtone_title"
|
||||
android:ringtoneType="notification"
|
||||
android:dependency="work_use_personal_sounds" />
|
||||
android:dependency="work_use_personal_sounds"/>
|
||||
|
||||
<!-- Default work alarm ringtone -->
|
||||
<com.android.settings.DefaultRingtonePreference
|
||||
@@ -232,7 +232,7 @@
|
||||
android:dialogTitle="@string/work_alarm_ringtone_title"
|
||||
android:persistent="false"
|
||||
android:ringtoneType="alarm"
|
||||
android:dependency="work_use_personal_sounds" />
|
||||
android:dependency="work_use_personal_sounds"/>
|
||||
|
||||
</com.android.settings.widget.WorkOnlyCategory>
|
||||
</PreferenceScreen>
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* 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;
|
||||
}
|
||||
}
|
@@ -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;
|
||||
|
@@ -0,0 +1,50 @@
|
||||
/*
|
||||
* 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 static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class ZenModeSoundSettingsPreferenceControllerTest {
|
||||
|
||||
private Context mContext;
|
||||
private ZenModeSoundSettingsPreferenceController mController;
|
||||
private static final String KEY_ZEN_MODE = "zen_mode";
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mController = new ZenModeSoundSettingsPreferenceController(mContext, KEY_ZEN_MODE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_available() {
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user