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

Commit 447421cb authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Moving shared classes to common.pip package 4/N 

- PipUtils is moved to common package and converted to Kotlin
- Added OWNERS file for pip2 package

Bug: 293306185
Test: m -j SystemUIGoogle
Change-Id: I62c9789b925036993d9ba06eb4a7dd97b2d115d3
parent e8d65a13

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipAppOpsListener.kt

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import android.app.AppOpsManager 
import android.content.Context

import android.content.pm.PackageManager

import com.android.wm.shell.common.ShellExecutor

import com.android.wm.shell.pip.PipUtils



class PipAppOpsListener(

    private val mContext: Context,

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipMediaController.kt

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.os.Handler 
import android.os.HandlerExecutor

import android.os.UserHandle

import com.android.wm.shell.R

import com.android.wm.shell.pip.PipUtils

import java.util.function.Consumer



/**

libs/WindowManager/Shell/src/com/android/wm/shell/common/pip/PipUtils.kt

0 → 100644
+144 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.wm.shell.common.pip



import android.app.ActivityTaskManager

import android.app.RemoteAction

import android.app.WindowConfiguration

import android.content.ComponentName

import android.content.Context

import android.os.RemoteException

import android.os.SystemProperties

import android.util.DisplayMetrics

import android.util.Log

import android.util.Pair

import android.util.TypedValue

import android.window.TaskSnapshot

import com.android.internal.protolog.common.ProtoLog

import com.android.wm.shell.protolog.ShellProtoLogGroup

import kotlin.math.abs



/** A class that includes convenience methods.  */

object PipUtils {

    private const val TAG = "PipUtils"



    // Minimum difference between two floats (e.g. aspect ratios) to consider them not equal.

    private const val EPSILON = 1e-7

    private const val ENABLE_PIP2_IMPLEMENTATION = "persist.wm.debug.enable_pip2_implementation"



    /**

     * @return the ComponentName and user id of the top non-SystemUI activity in the pinned stack.

     * The component name may be null if no such activity exists.

     */

    @JvmStatic

    fun getTopPipActivity(context: Context): Pair<ComponentName?, Int> {

        try {

            val sysUiPackageName = context.packageName

            val pinnedTaskInfo = ActivityTaskManager.getService().getRootTaskInfo(

                WindowConfiguration.WINDOWING_MODE_PINNED,

                WindowConfiguration.ACTIVITY_TYPE_UNDEFINED

            )

            if (pinnedTaskInfo?.childTaskIds != null && pinnedTaskInfo.childTaskIds.isNotEmpty()) {

                for (i in pinnedTaskInfo.childTaskNames.indices.reversed()) {

                    val cn = ComponentName.unflattenFromString(

                        pinnedTaskInfo.childTaskNames[i]

                    )

                    if (cn != null && cn.packageName != sysUiPackageName) {

                        return Pair(cn, pinnedTaskInfo.childTaskUserIds[i])

                    }

                }

            }

        } catch (e: RemoteException) {

            ProtoLog.w(

                ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                "%s: Unable to get pinned stack.", TAG

            )

        }

        return Pair(null, 0)

    }



    /**

     * @return the pixels for a given dp value.

     */

    @JvmStatic

    fun dpToPx(dpValue: Float, dm: DisplayMetrics?): Int {

        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dpValue, dm).toInt()

    }



    /**

     * @return true if the aspect ratios differ

     */

    @JvmStatic

    fun aspectRatioChanged(aspectRatio1: Float, aspectRatio2: Float): Boolean {

        return abs(aspectRatio1 - aspectRatio2) > EPSILON

    }



    /**

     * Checks whether title, description and intent match.

     * Comparing icons would be good, but using equals causes false negatives

     */

    @JvmStatic

    fun remoteActionsMatch(action1: RemoteAction?, action2: RemoteAction?): Boolean {

        if (action1 === action2) return true

        if (action1 == null || action2 == null) return false

        return action1.isEnabled == action2.isEnabled &&

                action1.shouldShowIcon() == action2.shouldShowIcon() &&

                action1.title == action2.title &&

                action1.contentDescription == action2.contentDescription &&

                action1.actionIntent == action2.actionIntent

    }



    /**

     * Returns true if the actions in the lists match each other according to

     * [ ][PipUtils.remoteActionsMatch], including their position.

     */

    @JvmStatic

    fun remoteActionsChanged(list1: List<RemoteAction?>?, list2: List<RemoteAction?>?): Boolean {

        if (list1 == null && list2 == null) {

            return false

        }

        if (list1 == null || list2 == null) {

            return true

        }

        if (list1.size != list2.size) {

            return true

        }

        for (i in list1.indices) {

            if (!remoteActionsMatch(list1[i], list2[i])) {

                return true

            }

        }

        return false

    }



    /** @return [TaskSnapshot] for a given task id.

     */

    @JvmStatic

    fun getTaskSnapshot(taskId: Int, isLowResolution: Boolean): TaskSnapshot? {

        return if (taskId <= 0) null else try {

            ActivityTaskManager.getService().getTaskSnapshot(

                taskId, isLowResolution, false /* takeSnapshotIfNeeded */

            )

        } catch (e: RemoteException) {

            Log.e(TAG, "Failed to get task snapshot, taskId=$taskId", e)

            null

        }

    }



    @JvmStatic

    val isPip2ExperimentEnabled: Boolean

        get() = SystemProperties.getBoolean(ENABLE_PIP2_IMPLEMENTATION, false)

}
 
 No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip1Module.java

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.wm.shell.common.pip.PhoneSizeSpecSource; 
import com.android.wm.shell.common.pip.PipAppOpsListener;

import com.android.wm.shell.common.pip.PipMediaController;

import com.android.wm.shell.common.pip.PipUiEventLogger;

import com.android.wm.shell.common.pip.PipUtils;

import com.android.wm.shell.common.pip.SizeSpecSource;

import com.android.wm.shell.dagger.WMShellBaseModule;

import com.android.wm.shell.dagger.WMSingleton;
@@ -50,7 +51,6 @@ import com.android.wm.shell.pip.PipTaskOrganizer; 
import com.android.wm.shell.pip.PipTransition;

import com.android.wm.shell.pip.PipTransitionController;

import com.android.wm.shell.pip.PipTransitionState;

import com.android.wm.shell.pip.PipUtils;

import com.android.wm.shell.pip.phone.PhonePipKeepClearAlgorithm;

import com.android.wm.shell.pip.phone.PhonePipMenuController;

import com.android.wm.shell.pip.phone.PipController;

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/PipModule.java

+1 −1
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.wm.shell.dagger.pip; 


import android.annotation.Nullable;



import com.android.wm.shell.common.pip.PipUtils;

import com.android.wm.shell.dagger.WMSingleton;

import com.android.wm.shell.pip.PipTransitionController;

import com.android.wm.shell.pip.PipUtils;



import dagger.Module;

import dagger.Provides;