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

Commit ce929194 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 88a8c586 d2ed9bad

res/xml/status_bar_settings.xml

+2 −0
Original line number Diff line number Diff line
@@ -122,11 +122,13 @@ 
            lineage:requiresConfig="@*android:bool/config_automatic_brightness_available"

            android:defaultValue="true" />



        <!--

        <lineageos.preference.LineageSystemSettingSwitchPreference

            android:key="status_bar_brightness_control"

            android:title="@string/status_bar_toggle_brightness"

            android:summary="@string/status_bar_toggle_brightness_summary"

            android:defaultValue="false" />

        -->

    </PreferenceCategory>



</PreferenceScreen>

src/org/lineageos/lineageparts/profiles/SeekBarVolumizer.java

+1 −2
Original line number Diff line number Diff line
@@ -229,8 +229,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba 
    }



    private boolean isNotificationStreamLinked() {

        return mVoiceCapable && Settings.Secure.getInt(mContext.getContentResolver(),

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

        return mVoiceCapable;

    }



    public void setSeekBar(SeekBar seekBar) {

src/org/lineageos/lineageparts/profiles/actions/item/VolumeStreamItem.java

+1 −3
Original line number Diff line number Diff line
@@ -58,9 +58,7 @@ public class VolumeStreamItem extends Item { 
        if (mStreamId != AudioManager.STREAM_NOTIFICATION) {

            return true;

        }

        final boolean volumeLinkNotification = Settings.Secure.getInt(

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

        return !volumeLinkNotification;

        return false;

    }



    public static int getNameForStream(int stream) {