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

Commit a5457096 authored by Mateusz Cicheński's avatar Mateusz Cicheński
Browse files

Refactoring rename of PipKeepClearAlgorithm 

Renaming PipKeepClearAlgorithm to PipKeepClearAlgorithmInterface,
to make an easier transition of moving TvPipKeepClearAlgorithm into
shared PiP codebase.

Test: n/a, refactoring code with IntelliJ, renaming interface
Bug: 265207213
Merged-In: Ic16cd7eefa034259d5d7f141f2817eb4f7b597ec
Change-Id: I2f15dc2d7912fa1df60c6211a8499cd7a222e59e
parent 12fb8ad3

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

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public class PipBoundsAlgorithm { 


    private final @NonNull PipBoundsState mPipBoundsState;

    private final PipSnapAlgorithm mSnapAlgorithm;

    private final PipKeepClearAlgorithm mPipKeepClearAlgorithm;

    private final PipKeepClearAlgorithmInterface mPipKeepClearAlgorithm;



    private float mDefaultSizePercent;

    private float mMinAspectRatioForMinSize;
@@ -62,7 +62,7 @@ public class PipBoundsAlgorithm { 


    public PipBoundsAlgorithm(Context context, @NonNull PipBoundsState pipBoundsState,

            @NonNull PipSnapAlgorithm pipSnapAlgorithm,

            @NonNull PipKeepClearAlgorithm pipKeepClearAlgorithm) {

            @NonNull PipKeepClearAlgorithmInterface pipKeepClearAlgorithm) {

        mPipBoundsState = pipBoundsState;

        mSnapAlgorithm = pipSnapAlgorithm;

        mPipKeepClearAlgorithm = pipKeepClearAlgorithm;

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipKeepClearAlgorithm.java→libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipKeepClearAlgorithmInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import java.util.Set; 
 * Interface for interacting with keep clear algorithm used to move PiP window out of the way of

 * keep clear areas.

 */

public interface PipKeepClearAlgorithm {

public interface PipKeepClearAlgorithmInterface {



    /**

     * Adjust the position of picture in picture window based on the registered keep clear areas.

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipKeepClearAlgorithm.java

+2 −2
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ import android.view.Gravity; 
import com.android.wm.shell.R;

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

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

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

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



import java.util.Set;



/**

 * Calculates the adjusted position that does not occlude keep clear areas.

 */

public class PhonePipKeepClearAlgorithm implements PipKeepClearAlgorithm {

public class PhonePipKeepClearAlgorithm implements PipKeepClearAlgorithmInterface {



    private boolean mKeepClearAreaGravityEnabled =

            SystemProperties.getBoolean(

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+4 −6
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ import android.content.res.Configuration; 
import android.graphics.Rect;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Pair;

import android.util.Size;

import android.view.DisplayInfo;
@@ -85,7 +83,7 @@ import com.android.wm.shell.pip.PipAnimationController; 
import com.android.wm.shell.pip.PipAppOpsListener;

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

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

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

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

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

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

import com.android.wm.shell.pip.PipSnapAlgorithm;
@@ -137,7 +135,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
    private PipAppOpsListener mAppOpsListener;

    private PipMediaController mMediaController;

    private PipBoundsAlgorithm mPipBoundsAlgorithm;

    private PipKeepClearAlgorithm mPipKeepClearAlgorithm;

    private PipKeepClearAlgorithmInterface mPipKeepClearAlgorithm;

    private PipBoundsState mPipBoundsState;

    private PipMotionHelper mPipMotionHelper;

    private PipTouchHandler mTouchHandler;
@@ -380,7 +378,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            PipAnimationController pipAnimationController,

            PipAppOpsListener pipAppOpsListener,

            PipBoundsAlgorithm pipBoundsAlgorithm,

            PipKeepClearAlgorithm pipKeepClearAlgorithm,

            PipKeepClearAlgorithmInterface pipKeepClearAlgorithm,

            PipBoundsState pipBoundsState,

            PipMotionHelper pipMotionHelper,

            PipMediaController pipMediaController,
@@ -419,7 +417,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            PipAnimationController pipAnimationController,

            PipAppOpsListener pipAppOpsListener,

            PipBoundsAlgorithm pipBoundsAlgorithm,

            PipKeepClearAlgorithm pipKeepClearAlgorithm,

            PipKeepClearAlgorithmInterface pipKeepClearAlgorithm,

            @NonNull PipBoundsState pipBoundsState,

            PipMotionHelper pipMotionHelper,

            PipMediaController pipMediaController,

libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsAlgorithm.java

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import com.android.internal.protolog.common.ProtoLog; 
import com.android.wm.shell.R;

import com.android.wm.shell.common.DisplayLayout;

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

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

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

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

import com.android.wm.shell.pip.tv.TvPipKeepClearAlgorithm.Placement;

import com.android.wm.shell.protolog.ShellProtoLogGroup;
@@ -65,7 +65,7 @@ public class TvPipBoundsAlgorithm extends PipBoundsAlgorithm { 
            @NonNull TvPipBoundsState tvPipBoundsState,

            @NonNull PipSnapAlgorithm pipSnapAlgorithm) {

        super(context, tvPipBoundsState, pipSnapAlgorithm,

                new PipKeepClearAlgorithm() {});

                new PipKeepClearAlgorithmInterface() {});

        this.mTvPipBoundsState = tvPipBoundsState;

        this.mKeepClearAlgorithm = new TvPipKeepClearAlgorithm();

        reloadResources(context);