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

Commit ec458821 authored by Wes Garner's avatar Wes Garner Committed by Steve Kondik
Browse files

LockScreen: Show Music Controls if headset is connected (enable via CMParts) 

Change-Id: Ibb1420cb2e35a9f6b1dd6c43bafda884cab6b06e
Change-Id: I9cd580147fcf14f31c3d580155e415daa3eb0ce4
parent 904c17c8

core/java/android/provider/Settings.java

+8 −2
Original line number Diff line number Diff line
@@ -2216,13 +2216,19 @@ public final class Settings { 
        public static final String LOCKSCREEN_ALWAYS_BATTERY = "lockscreen_always_battery";



        /**

         * Whether to use custom notification bar

         * Whether to use lockscreen music controls

         * @hide

         */

        public static final String LOCKSCREEN_MUSIC_CONTROLS = "lockscreen_music_controls";



        /**

         * Whether to use custom notification bar

         * Whether to use lockscreen music controls with headset connected

         * @hide

         */

        public static final String LOCKSCREEN_MUSIC_CONTROLS_HEADSET = "lockscreen_music_controls_headset";



        /**

         * Whether to use always use lockscreen music controls

         * @hide

         */

        public static final String LOCKSCREEN_ALWAYS_MUSIC_CONTROLS = "lockscreen_always_music_controls";

policy/src/com/android/internal/policy/impl/LockScreen.java

+8 −1
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
    private boolean mLockMusicControls = (Settings.System.getInt(mContext.getContentResolver(),

            Settings.System.LOCKSCREEN_MUSIC_CONTROLS, 1) == 1);



    private int mLockMusicHeadset = (Settings.System.getInt(mContext.getContentResolver(),

            Settings.System.LOCKSCREEN_MUSIC_CONTROLS_HEADSET, 0));

    private boolean useLockMusicHeadsetWired = ((mLockMusicHeadset == 1) || (mLockMusicHeadset == 3));

    private boolean useLockMusicHeadsetBT = ((mLockMusicHeadset == 2) || (mLockMusicHeadset == 3));



    private boolean mLockAlwaysMusic = (Settings.System.getInt(mContext.getContentResolver(),

            Settings.System.LOCKSCREEN_ALWAYS_MUSIC_CONTROLS, 0) == 1);
@@ -670,7 +675,9 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
    }



    private void refreshMusicStatus() {

        if ((mWasMusicActive || mIsMusicActive || mLockAlwaysMusic) && (mLockMusicControls)) {

        if ((mWasMusicActive || mIsMusicActive || mLockAlwaysMusic

            || (mAudioManager.isWiredHeadsetOn() && useLockMusicHeadsetWired)

            || (mAudioManager.isBluetoothA2dpOn() && useLockMusicHeadsetBT)) && (mLockMusicControls)) {

            if (am.isMusicActive()) {

                mPauseIcon.setVisibility(View.VISIBLE);

                mPlayIcon.setVisibility(View.GONE);