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

Commit c7ab9918 authored by Nick Chameyev's avatar Nick Chameyev Committed by Android (Google) Code Review
Browse files

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

parents 5c17f6b9 dd2311e7

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+3 −2
Original line number Diff line number Diff line
@@ -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),

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+4 −2
Original line number Diff line number Diff line
@@ -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 =