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

Commit 4611bba7 authored by Winson Chung's avatar Winson Chung
Browse files

Cleanup some unused code and update resources on config change 

Change-Id: Icf4cfe2c0cebb3b869909385f3d4e7b4131047c3
Bug: 156791199
Test: atest PinnedStackTests
parent 535e4abd

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,9 @@ 
    <!-- The corner radius for PiP window. -->

    <dimen name="pip_corner_radius">8dp</dimen>



    <!-- The buffer to use when calculating whether the pip is in an adjust zone. -->

    <dimen name="pip_bottom_offset_buffer">1dp</dimen>



    <dimen name="default_gear_space">18dp</dimen>

    <dimen name="cell_overlay_padding">18dp</dimen>

packages/SystemUI/src/com/android/systemui/pip/PipBoundsHandler.java

+0 −1
Original line number Diff line number Diff line
@@ -500,6 +500,5 @@ public class PipBoundsHandler { 
        pw.println(innerPrefix + "mImeHeight=" + mImeHeight);

        pw.println(innerPrefix + "mIsShelfShowing=" + mIsShelfShowing);

        pw.println(innerPrefix + "mShelfHeight=" + mShelfHeight);

        mSnapAlgorithm.dump(pw, innerPrefix);

    }

}

packages/SystemUI/src/com/android/systemui/pip/PipSnapAlgorithm.java

+0 −20
Original line number Diff line number Diff line
@@ -17,14 +17,11 @@ 
package com.android.systemui.pip;



import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.PointF;

import android.graphics.Rect;

import android.util.Size;



import java.io.PrintWriter;



import javax.inject.Inject;



/**
@@ -39,8 +36,6 @@ public class PipSnapAlgorithm { 
    private final float mMinAspectRatioForMinSize;

    private final float mMaxAspectRatioForMinSize;



    private int mOrientation = Configuration.ORIENTATION_UNDEFINED;



    @Inject

    public PipSnapAlgorithm(Context context) {

        Resources res = context.getResources();
@@ -50,15 +45,6 @@ public class PipSnapAlgorithm { 
        mMaxAspectRatioForMinSize = res.getFloat(

                com.android.internal.R.dimen.config_pictureInPictureAspectRatioLimitForMinSize);

        mMinAspectRatioForMinSize = 1f / mMaxAspectRatioForMinSize;

        onConfigurationChanged();

    }



    /**

     * Updates the snap algorithm when the configuration changes.

     */

    public void onConfigurationChanged() {

        Resources res = mContext.getResources();

        mOrientation = res.getConfiguration().orientation;

    }



    /**
@@ -221,10 +207,4 @@ public class PipSnapAlgorithm { 
            boundsOut.offsetTo(boundedLeft, movementBounds.bottom);

        }

    }



    public void dump(PrintWriter pw, String prefix) {

        final String innerPrefix = prefix + "  ";

        pw.println(prefix + PipSnapAlgorithm.class.getSimpleName());

        pw.println(innerPrefix + "mOrientation=" + mOrientation);

    }

}

packages/SystemUI/src/com/android/systemui/pip/PipSurfaceTransactionHelper.java

+12 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.RectF; 
import android.view.SurfaceControl;



import com.android.systemui.R;

import com.android.systemui.statusbar.policy.ConfigurationController;



import javax.inject.Inject;

import javax.inject.Singleton;
@@ -32,10 +33,11 @@ import javax.inject.Singleton; 
 * Abstracts the common operations on {@link SurfaceControl.Transaction} for PiP transition.

 */

@Singleton

public class PipSurfaceTransactionHelper {

public class PipSurfaceTransactionHelper implements ConfigurationController.ConfigurationListener {



    private final Context mContext;

    private final boolean mEnableCornerRadius;

    private final int mCornerRadius;

    private int mCornerRadius;



    /** for {@link #scale(SurfaceControl.Transaction, SurfaceControl, Rect, Rect)} operation */

    private final Matrix mTmpTransform = new Matrix();
@@ -44,9 +46,16 @@ public class PipSurfaceTransactionHelper { 
    private final RectF mTmpDestinationRectF = new RectF();



    @Inject

    public PipSurfaceTransactionHelper(Context context) {

    public PipSurfaceTransactionHelper(Context context, ConfigurationController configController) {

        final Resources res = context.getResources();

        mContext = context;

        mEnableCornerRadius = res.getBoolean(R.bool.config_pipEnableRoundCorner);

        configController.addCallback(this);

    }



    @Override

    public void onDensityOrFontScaleChanged() {

        final Resources res = mContext.getResources();

        mCornerRadius = res.getDimensionPixelSize(R.dimen.pip_corner_radius);

    }

packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java

+0 −13
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import androidx.dynamicanimation.animation.SpringForce; 


import com.android.systemui.pip.PipSnapAlgorithm;

import com.android.systemui.pip.PipTaskOrganizer;

import com.android.systemui.shared.system.WindowManagerWrapper;

import com.android.systemui.util.FloatingContentCoordinator;

import com.android.systemui.util.animation.FloatProperties;

import com.android.systemui.util.animation.PhysicsAnimator;
@@ -60,8 +59,6 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
    private PipMenuActivityController mMenuController;

    private PipSnapAlgorithm mSnapAlgorithm;



    private final Rect mStableInsets = new Rect();



    /** PIP's current bounds on the screen. */

    private final Rect mBounds = new Rect();
@@ -148,7 +145,6 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
        mMenuController = menuController;

        mSnapAlgorithm = snapAlgorithm;

        mFloatingContentCoordinator = floatingContentCoordinator;

        onConfigurationChanged();

        mPipTaskOrganizer.registerPipTransitionCallback(mPipTransitionCallback);

    }
@@ -169,14 +165,6 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
        animateToBounds(bounds, mConflictResolutionSpringConfig);

    }



    /**

     * Updates whenever the configuration changes.

     */

    void onConfigurationChanged() {

        mSnapAlgorithm.onConfigurationChanged();

        WindowManagerWrapper.getInstance().getStableInsets(mStableInsets);

    }



    /**

     * Synchronizes the current bounds with the pinned stack, cancelling any ongoing animations.

     */
@@ -530,6 +518,5 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
        final String innerPrefix = prefix + "  ";

        pw.println(prefix + TAG);

        pw.println(innerPrefix + "mBounds=" + mBounds);

        pw.println(innerPrefix + "mStableInsets=" + mStableInsets);

    }

}