PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing NPE in TransfromParams.java" into udc-dev am: 4d17468f88 am: 1210d4445a

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

Change-Id: Id483676c28e6fd20e737f94c3afd6ec38b0e7534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jagrut Desai
2023-05-10 20:01:29 +00:00
committed by Automerger Merge Worker
parent 54bd4c60fc 1210d4445a
commit 76f91f8ebd
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/util/TransformParams.java
+3 -23
View File
@@ -17,11 +17,9 @@ package com.android.quickstep.util;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import android.util.FloatProperty; import android.util.FloatProperty;
import android.view.RemoteAnimationTarget; import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl;
import com.android.launcher3.Utilities; import com.android.launcher3.Utilities;
import com.android.launcher3.anim.Interpolators; import com.android.launcher3.anim.Interpolators;
@@ -61,7 +59,6 @@ public class TransformParams {
private float mCornerRadius; private float mCornerRadius;
private RemoteAnimationTargets mTargetSet; private RemoteAnimationTargets mTargetSet;
private SurfaceTransactionApplier mSyncTransactionApplier; private SurfaceTransactionApplier mSyncTransactionApplier;
private SurfaceControl mRecentsSurface;
private BuilderProxy mHomeBuilderProxy = BuilderProxy.ALWAYS_VISIBLE; private BuilderProxy mHomeBuilderProxy = BuilderProxy.ALWAYS_VISIBLE;
private BuilderProxy mBaseBuilderProxy = BuilderProxy.ALWAYS_VISIBLE; private BuilderProxy mBaseBuilderProxy = BuilderProxy.ALWAYS_VISIBLE;
@@ -141,8 +138,9 @@ public class TransformParams {
public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) { public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) {
RemoteAnimationTargets targets = mTargetSet; RemoteAnimationTargets targets = mTargetSet;
SurfaceTransaction transaction = new SurfaceTransaction(); SurfaceTransaction transaction = new SurfaceTransaction();
mRecentsSurface = getRecentsSurface(targets); if (targets == null) {
return transaction;
}
for (int i = 0; i < targets.unfilteredApps.length; i++) { for (int i = 0; i < targets.unfilteredApps.length; i++) {
RemoteAnimationTarget app = targets.unfilteredApps[i]; RemoteAnimationTarget app = targets.unfilteredApps[i];
SurfaceProperties builder = transaction.forSurface(app.leash); SurfaceProperties builder = transaction.forSurface(app.leash);
@@ -176,20 +174,6 @@ public class TransformParams {
return transaction; return transaction;
} }
private static SurfaceControl getRecentsSurface(RemoteAnimationTargets targets) {
for (int i = 0; i < targets.unfilteredApps.length; i++) {
RemoteAnimationTarget app = targets.unfilteredApps[i];
if (app.mode == targets.targetMode) {
if (app.windowConfiguration.getActivityType() == ACTIVITY_TYPE_RECENTS) {
return app.leash;
}
} else {
return app.leash;
}
}
return null;
}
// Pubic getters so outside packages can read the values. // Pubic getters so outside packages can read the values.
public float getProgress() { public float getProgress() {
@@ -204,10 +188,6 @@ public class TransformParams {
return mCornerRadius; return mCornerRadius;
} }
public SurfaceControl getRecentsSurface() {
return mRecentsSurface;
}
public RemoteAnimationTargets getTargetSet() { public RemoteAnimationTargets getTargetSet() {
return mTargetSet; return mTargetSet;
} }