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

Commit 5ee0e5c3 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

Merge "No translating down for Dream to Keyguard (unoccluding) transit." into tm-qpr-dev

parents 72d9e091 71b98a9e

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+19 −12
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ import android.app.ActivityTaskManager; 
import android.app.AlarmManager;

import android.app.AlarmManager;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.app.StatusBarManager;

import android.app.StatusBarManager;

import android.app.WindowConfiguration;

import android.app.trust.TrustManager;

import android.app.trust.TrustManager;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ComponentName;
@@ -921,6 +922,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                    }

                    }





                    final RemoteAnimationTarget primary = apps[0];

                    final RemoteAnimationTarget primary = apps[0];

                    final boolean isDream = (apps[0].taskInfo.topActivityType

                            == WindowConfiguration.ACTIVITY_TYPE_DREAM);





                    final SyncRtSurfaceTransactionApplier applier =

                    final SyncRtSurfaceTransactionApplier applier =

                            new SyncRtSurfaceTransactionApplier(

                            new SyncRtSurfaceTransactionApplier(
@@ -942,20 +945,24 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 




                                    final float surfaceHeight = primary.screenSpaceBounds.height();

                                    final float surfaceHeight = primary.screenSpaceBounds.height();





                                    // Fade for all types of activities.

                                    SyncRtSurfaceTransactionApplier.SurfaceParams.Builder

                                            paramsBuilder =

                                            new SyncRtSurfaceTransactionApplier.SurfaceParams

                                                    .Builder(primary.leash)

                                                    .withAlpha(animatedValue);

                                    // Set translate if the occluding activity isn't Dream.

                                    if (!isDream) {

                                        mUnoccludeMatrix.setTranslate(

                                        mUnoccludeMatrix.setTranslate(

                                                0f,

                                                0f,

                                                (1f - animatedValue)

                                                (1f - animatedValue)

                                                        * surfaceHeight

                                                        * surfaceHeight

                                                        * UNOCCLUDE_TRANSLATE_DISTANCE_PERCENT);

                                                        * UNOCCLUDE_TRANSLATE_DISTANCE_PERCENT);





                                    SyncRtSurfaceTransactionApplier.SurfaceParams params =

                                        paramsBuilder.withMatrix(mUnoccludeMatrix).withCornerRadius(

                                            new SyncRtSurfaceTransactionApplier.SurfaceParams

                                                mWindowCornerRadius);

                                                    .Builder(primary.leash)

                                    }

                                                    .withMatrix(mUnoccludeMatrix)

                                    applier.scheduleApply(paramsBuilder.build());

                                                    .withCornerRadius(mWindowCornerRadius)

                                                    .withAlpha(animatedValue)

                                                    .build();

                                    applier.scheduleApply(params);

                                });

                                });

                        mUnoccludeAnimator.addListener(new AnimatorListenerAdapter() {

                        mUnoccludeAnimator.addListener(new AnimatorListenerAdapter() {

                            @Override

                            @Override