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

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

Browse Source
This commit is contained in:
Xiaowen Lei
2022-05-26 17:47:42 +00:00
committed by Android (Google) Code Review
parent 72d9e091c4 71b98a9eae
commit 5ee0e5c31b
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -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();
mUnoccludeMatrix.setTranslate( // Fade for all types of activities.
0f, SyncRtSurfaceTransactionApplier.SurfaceParams.Builder
(1f - animatedValue) paramsBuilder =
* surfaceHeight
* UNOCCLUDE_TRANSLATE_DISTANCE_PERCENT);
SyncRtSurfaceTransactionApplier.SurfaceParams params =
new SyncRtSurfaceTransactionApplier.SurfaceParams new SyncRtSurfaceTransactionApplier.SurfaceParams
.Builder(primary.leash) .Builder(primary.leash)
.withMatrix(mUnoccludeMatrix) .withAlpha(animatedValue);
.withCornerRadius(mWindowCornerRadius) // Set translate if the occluding activity isn't Dream.
.withAlpha(animatedValue) if (!isDream) {
.build(); mUnoccludeMatrix.setTranslate(
applier.scheduleApply(params); 0f,
(1f - animatedValue)
* surfaceHeight
* UNOCCLUDE_TRANSLATE_DISTANCE_PERCENT);
paramsBuilder.withMatrix(mUnoccludeMatrix).withCornerRadius(
mWindowCornerRadius);
}
applier.scheduleApply(paramsBuilder.build());
}); });
mUnoccludeAnimator.addListener(new AnimatorListenerAdapter() { mUnoccludeAnimator.addListener(new AnimatorListenerAdapter() {
@Override @Override