Merge "Do not use private APIs in unfold module" into tm-qpr-dev am: c7ab991818

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21523105

Change-Id: Ida34210a83f096beb2c2bb9346dbe864ac09d2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nick Chameyev
2023-03-03 17:26:01 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 4 deletions

View File

@@ -45,6 +45,7 @@ import android.content.pm.LauncherApps;
import android.content.res.Resources;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.hardware.display.DisplayManager;
import android.os.Process;
import android.os.SystemProperties;
import android.os.Trace;
@@ -218,8 +219,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
new TaskbarScrimViewController(this, taskbarScrimView),
new TaskbarUnfoldAnimationController(this, unfoldTransitionProgressProvider,
mWindowManager,
new RotationChangeProvider(WindowManagerGlobal.getWindowManagerService(), this,
getMainExecutor())),
new RotationChangeProvider(c.getSystemService(DisplayManager.class), this,
getMainThreadHandler())),
new TaskbarKeyguardController(this),
new StashedHandleViewController(this, stashedHandleView),
new TaskbarStashController(this),

View File

@@ -68,6 +68,7 @@ import android.graphics.Rect;
import android.graphics.RectF;
import android.hardware.SensorManager;
import android.hardware.devicestate.DeviceStateManager;
import android.hardware.display.DisplayManager;
import android.media.permission.SafeCloseable;
import android.os.Bundle;
import android.os.CancellationSignal;
@@ -882,7 +883,7 @@ public class QuickstepLauncher extends Launcher {
getMainExecutor(),
/* backgroundExecutor= */ UI_HELPER_EXECUTOR,
/* tracingTagPrefix= */ "launcher",
WindowManagerGlobal.getWindowManagerService()
getSystemService(DisplayManager.class)
);
mUnfoldTransitionProgressProvider = unfoldComponent.getUnfoldTransitionProvider()
@@ -901,9 +902,10 @@ public class QuickstepLauncher extends Launcher {
/* context= */ this,
config,
getMainExecutor(),
getMainThreadHandler(),
/* backgroundExecutor= */ UI_HELPER_EXECUTOR,
/* tracingTagPrefix= */ "launcher",
WindowManagerGlobal.getWindowManagerService()
getSystemService(DisplayManager.class)
);
final RemoteUnfoldTransitionReceiver remoteUnfoldTransitionProgressProvider =