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

Commit 1b3ec047 authored by Doris Ling's avatar Doris Ling
Browse files

Update SoundSettings to extend DashboardFragment. 

- initial round of refactoring SoundSettings to use DashboardFragment.
- add controller for Cast, Do not disturb, Alarm volume, Media volume,
  Ring volume and Notification volume.

Bug: 32276590
Test: make RunSettingsRoboTests
Change-Id: I5c02a344bff5117bfce93d7ccac650fccc82d2b0
parent 7aad8a97

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

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

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

import android.os.UserHandle;

import android.os.UserManager;

import android.support.v7.preference.Preference;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.accounts.AccountRestrictionHelper;

import com.android.settings.core.PreferenceController;

import com.android.settingslib.RestrictedPreference;



/**

 * Base class for preference controller that handles preference that enforce adjust volume

 * restriction

 */

public abstract class AdjustVolumeRestrictedPreferenceController extends PreferenceController {



    private AccountRestrictionHelper mHelper;



    public AdjustVolumeRestrictedPreferenceController(Context context) {

        this(context, new AccountRestrictionHelper(context));

    }



    @VisibleForTesting

    AdjustVolumeRestrictedPreferenceController(Context context, AccountRestrictionHelper helper) {

        super(context);

        mHelper = helper;

    }



    @Override

    public void updateState(Preference preference) {

        if (!(preference instanceof RestrictedPreference)) {

            return;

        }

        mHelper.enforceRestrictionOnPreference((RestrictedPreference) preference,

                UserManager.DISALLOW_ADJUST_VOLUME, UserHandle.myUserId());

    }



}

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

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

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

import android.media.AudioManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.core.lifecycle.Lifecycle;

import com.android.settings.notification.VolumeSeekBarPreference.Callback;



public class AlarmVolumePreferenceController extends

    VolumeSeekBarPreferenceController {



    private static final String KEY_ALARM_VOLUME = "alarm_volume";

    private AudioHelper mHelper;



    public AlarmVolumePreferenceController(Context context, Callback callback,

        Lifecycle lifecycle) {

        this(context, callback, lifecycle, new AudioHelper(context));

    }



    @VisibleForTesting

    AlarmVolumePreferenceController(Context context, Callback callback, Lifecycle lifecycle,

        AudioHelper helper) {

        super(context, callback, lifecycle);

        mHelper = helper;

    }



    @Override

    public boolean isAvailable() {

        return !mHelper.isSingleVolume();

    }



    @Override

    public String getPreferenceKey() {

        return KEY_ALARM_VOLUME;

    }



    @Override

    public int getAudioStream() {

        return AudioManager.STREAM_ALARM;

    }



    @Override

    public int getMuteIcon() {

        return com.android.internal.R.drawable.ic_audio_alarm_mute;

    }



}

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

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

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

import android.media.AudioSystem;



/**

 * Helper class to wrap API for testing

 */

public class AudioHelper {



    private Context mContext;



    public AudioHelper(Context context) {

        mContext = context;

    }



    public boolean isSingleVolume() {

        return AudioSystem.isSingleVolume(mContext);

    }



}

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

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

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

import android.support.v7.preference.Preference;



import com.android.settings.Utils;

import com.android.settings.core.PreferenceController;

import java.util.List;



public class CastPreferenceController extends PreferenceController {



    private static final String KEY_WIFI_DISPLAY = "wifi_display";



    public CastPreferenceController(Context context) {

        super(context);

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        return false;

    }



    @Override

    public String getPreferenceKey() {

        return KEY_WIFI_DISPLAY;

    }



    @Override

    public boolean isAvailable() {

        return true;

    }



    @Override

    public void updateNonIndexableKeys(List<String> keys) {

        if (!Utils.isVoiceCapable(mContext)) {

            keys.add(KEY_WIFI_DISPLAY);

        }

    }



}

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

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

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

import android.media.AudioManager;

import com.android.settings.core.lifecycle.Lifecycle;

import com.android.settings.notification.VolumeSeekBarPreference.Callback;



public class MediaVolumePreferenceController extends

    VolumeSeekBarPreferenceController {



    private static final String KEY_MEDIA_VOLUME = "media_volume";



    public MediaVolumePreferenceController(Context context, Callback callback, Lifecycle lifecycle) {

        super(context, callback, lifecycle);

    }



    @Override

    public boolean isAvailable() {

        return true;

    }



    @Override

    public String getPreferenceKey() {

        return KEY_MEDIA_VOLUME;

    }



    @Override

    public int getAudioStream() {

        return AudioManager.STREAM_MUSIC;

    }



    @Override

    public int getMuteIcon() {

        return com.android.internal.R.drawable.ic_audio_media_mute;

    }



}