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

Commit 5c4f7141 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix how taskview is used by controlsUi" into udc-dev am: 646c4f25 

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



Change-Id: I245f2ba55265dd345ba51f5a8c6e5657a2b4f1fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7799f1ab 646c4f25

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+2 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ class ControlsUiControllerImpl @Inject constructor ( 


        controlsListingController.get().removeCallback(listingCallback)

        controlsController.get().unsubscribe()

        taskViewController?.dismiss()

        taskViewController?.removeTask()

        taskViewController = null



        val fadeAnim = ObjectAnimator.ofFloat(parent, "alpha", 1.0f, 0.0f)
@@ -777,7 +777,7 @@ class ControlsUiControllerImpl @Inject constructor ( 


            closeDialogs(true)

            controlsController.get().unsubscribe()

            taskViewController?.dismiss()

            taskViewController?.removeTask()

            taskViewController = null



            controlsById.clear()

packages/SystemUI/src/com/android/systemui/controls/ui/PanelTaskViewController.kt

+10 −14
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
package com.android.systemui.controls.ui



import android.app.ActivityOptions

import android.app.ActivityTaskManager

import android.app.ActivityTaskManager.INVALID_TASK_ID

import android.app.PendingIntent

import android.content.ComponentName
@@ -28,6 +27,7 @@ import android.graphics.Color 
import android.graphics.drawable.ShapeDrawable

import android.graphics.drawable.shapes.RoundRectShape

import android.os.Trace

import com.android.internal.annotations.VisibleForTesting

import com.android.systemui.R

import com.android.systemui.util.boundsOnScreen

import com.android.wm.shell.taskview.TaskView
@@ -54,12 +54,6 @@ class PanelTaskViewController( 
            addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK)

        }



    private fun removeDetailTask() {

        if (detailTaskId == INVALID_TASK_ID) return

        ActivityTaskManager.getInstance().removeTask(detailTaskId)

        detailTaskId = INVALID_TASK_ID

    }



    private val stateCallback =

        object : TaskView.Listener {

            override fun onInitialized() {
@@ -95,7 +89,7 @@ class PanelTaskViewController( 


            override fun onTaskRemovalStarted(taskId: Int) {

                detailTaskId = INVALID_TASK_ID

                dismiss()

                release()

            }



            override fun onTaskCreated(taskId: Int, name: ComponentName?) {
@@ -103,12 +97,7 @@ class PanelTaskViewController( 
                taskView.alpha = 1f

            }



            override fun onReleased() {

                removeDetailTask()

            }



            override fun onBackPressedOnTaskRoot(taskId: Int) {

                dismiss()

                hide()

            }

        }
@@ -117,10 +106,17 @@ class PanelTaskViewController( 
        taskView.onLocationChanged()

    }



    fun dismiss() {

    /** Call when the taskView is no longer being used, shouldn't be called before removeTask. */

    @VisibleForTesting

    fun release() {

        taskView.release()

    }



    /** Call to explicitly remove the task from window manager. */

    fun removeTask() {

        taskView.removeTask()

    }



    fun launchTaskView() {

        taskView.setListener(uiExecutor, stateCallback)

    }

packages/SystemUI/tests/src/com/android/systemui/controls/ui/PanelTaskViewControllerTest.kt

+2 −11
Original line number Diff line number Diff line
@@ -146,17 +146,8 @@ class PanelTaskViewControllerTest : SysuiTestCase() { 
    }



    @Test

    fun testTaskViewReleasedOnDismiss() {

        underTest.dismiss()

        verify(taskView).release()

    }



    @Test

    fun testTaskViewReleasedOnBackOnRoot() {

        underTest.launchTaskView()

        verify(taskView).setListener(any(), capture(listenerCaptor))



        listenerCaptor.value.onBackPressedOnTaskRoot(0)

    fun testTaskViewReleasedOnRelease() {

        underTest.release()

        verify(taskView).release()

    }