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

Commit ea629f6f authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Revert "Profiles: Disable notification item if ringtone & notification volumes are linked" 

TICKET: CYNGNOS-958

This reverts commit e9395fc4.

Change-Id: Ia0dfc91eb5c1945865b97982c6efd3f2afc1ac0e
parent e9395fc4

src/com/android/settings/profiles/actions/item/VolumeStreamItem.java

+1 −12
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.profiles.actions.item; 
import cyanogenmod.profiles.StreamSettings;

import android.content.Context;

import android.media.AudioManager;

import android.provider.Settings;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -30,7 +29,6 @@ import com.android.settings.profiles.actions.ItemListAdapter; 
public class VolumeStreamItem implements Item {

    private int mStreamId;

    private StreamSettings mStreamSettings;

    private boolean mEnabled;



    public VolumeStreamItem(int streamId, StreamSettings streamSettings) {

        mStreamId = streamId;
@@ -44,7 +42,7 @@ public class VolumeStreamItem implements Item { 


    @Override

    public boolean isEnabled() {

        return mEnabled;

        return true;

    }



    @Override
@@ -73,15 +71,6 @@ public class VolumeStreamItem implements Item { 
            desc.setText(context.getString(R.string.profile_action_none));

        }



        final boolean volumeLinkNotification = Settings.Secure.getInt(context

                .getContentResolver(), Settings.Secure.VOLUME_LINK_NOTIFICATION, 1) == 1;

        mEnabled = true;

        if (mStreamId == AudioManager.STREAM_NOTIFICATION && volumeLinkNotification) {

            mEnabled = false;

            text.setEnabled(false);

            desc.setEnabled(false);

        }



        return view;

    }