Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Persist the launcher keep clear area." into tm-qpr-dev am: edf1ca06b3

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

Change-Id: I2169b909ea5435036c5b49f119773af4da639196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2023-03-15 15:57:19 +00:00
committed by Automerger Merge Worker
parent ccd0728c31 edf1ca06b3
commit d4c5eac381
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,6 @@ import com.android.wm.shell.sysui.UserChangeListener;
import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.transition.Transitions;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@@ -118,6 +117,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb
UserChangeListener { UserChangeListener {
private static final String TAG = "PipController"; private static final String TAG = "PipController";
private static final String LAUNCHER_KEEP_CLEAR_AREA_TAG = "hotseat";
private static final long PIP_KEEP_CLEAR_AREAS_DELAY = private static final long PIP_KEEP_CLEAR_AREAS_DELAY =
SystemProperties.getLong("persist.wm.debug.pip_keep_clear_areas_delay", 200); SystemProperties.getLong("persist.wm.debug.pip_keep_clear_areas_delay", 200);
@@ -929,12 +930,10 @@ public class PipController implements PipTransitionController.PipTransitionCallb
0, mPipBoundsState.getDisplayBounds().bottom - height, 0, mPipBoundsState.getDisplayBounds().bottom - height,
mPipBoundsState.getDisplayBounds().right, mPipBoundsState.getDisplayBounds().right,
mPipBoundsState.getDisplayBounds().bottom); mPipBoundsState.getDisplayBounds().bottom);
Set<Rect> restrictedKeepClearAreas = new HashSet<>( mPipBoundsState.addNamedUnrestrictedKeepClearArea(LAUNCHER_KEEP_CLEAR_AREA_TAG, rect);
mPipBoundsState.getRestrictedKeepClearAreas());
restrictedKeepClearAreas.add(rect);
mPipBoundsState.setKeepClearAreas(restrictedKeepClearAreas,
mPipBoundsState.getUnrestrictedKeepClearAreas());
updatePipPositionForKeepClearAreas(); updatePipPositionForKeepClearAreas();
} else {
mPipBoundsState.removeNamedUnrestrictedKeepClearArea(LAUNCHER_KEEP_CLEAR_AREA_TAG);
} }
} }