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

Commit 370de141 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't require unlock to dismiss a media control" into sc-dev am: d565aaa1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14728910

Change-Id: I3051706d075cbc200a76816efa7d16820e8617a1
parents c3943f2b d565aaa1

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+4 −10
Original line number Diff line number Diff line
@@ -447,11 +447,8 @@ public class MediaControlPanel { 


            if (mKey != null) {

                closeGuts();

                mKeyguardDismissUtil.executeWhenUnlocked(() -> {

                mMediaDataManagerLazy.get().dismissMediaData(mKey,

                        MediaViewController.GUTS_ANIMATION_DURATION + 100);

                    return true;

                }, /* requiresShadeOpen */ true, false);

            } else {

                Log.w(TAG, "Dismiss media with null notification. Token uid="

                        + data.getToken().getUid());
@@ -576,11 +573,8 @@ public class MediaControlPanel { 
            logSmartspaceCardReported(761, // SMARTSPACE_CARD_DISMISS

                    /* isRecommendationCard */ true);

            closeGuts();

            mKeyguardDismissUtil.executeWhenUnlocked(() -> {

            mMediaDataManagerLazy.get().dismissSmartspaceRecommendation(

                    MediaViewController.GUTS_ANIMATION_DURATION + 100L);

                return true;

            }, true /* requiresShadeOpen */, false);

        });



        mController = null;

packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import org.junit.runner.RunWith 
import org.mockito.ArgumentCaptor

import org.mockito.ArgumentMatchers.anyLong

import org.mockito.Mock

import org.mockito.Mockito.anyBoolean

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.verify
@@ -329,11 +328,6 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(dismiss.isEnabled).isEqualTo(true)

        dismiss.callOnClick()

        val captor = ArgumentCaptor.forClass(ActivityStarter.OnDismissAction::class.java)

        verify(keyguardDismissUtil).executeWhenUnlocked(captor.capture(), anyBoolean(),

            eq(false))



        captor.value.onDismiss()

        verify(mediaDataManager).dismissMediaData(eq(mediaKey), anyLong())

    }