Merge "Remove dead stub occlude/unocclude animators" into udc-dev am: 3c0f9d6678
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23381936 Change-Id: Iafcc208991d7787098d07eb92b99ee8a26cd5b14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -307,46 +307,6 @@ public class KeyguardService extends Service {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final IRemoteTransition mOccludeAnimation = new IRemoteTransition.Stub() {
|
|
||||||
@Override
|
|
||||||
public void startAnimation(IBinder transition, TransitionInfo info,
|
|
||||||
SurfaceControl.Transaction t, IRemoteTransitionFinishedCallback finishCallback)
|
|
||||||
throws RemoteException {
|
|
||||||
t.apply();
|
|
||||||
mBinder.setOccluded(true /* isOccluded */, true /* animate */);
|
|
||||||
finishCallback.onTransitionFinished(null /* wct */, null /* wctCB */);
|
|
||||||
info.releaseAllSurfaces();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mergeAnimation(IBinder transition, TransitionInfo info,
|
|
||||||
SurfaceControl.Transaction t, IBinder mergeTarget,
|
|
||||||
IRemoteTransitionFinishedCallback finishCallback) {
|
|
||||||
t.close();
|
|
||||||
info.releaseAllSurfaces();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
final IRemoteTransition mUnoccludeAnimation = new IRemoteTransition.Stub() {
|
|
||||||
@Override
|
|
||||||
public void startAnimation(IBinder transition, TransitionInfo info,
|
|
||||||
SurfaceControl.Transaction t, IRemoteTransitionFinishedCallback finishCallback)
|
|
||||||
throws RemoteException {
|
|
||||||
t.apply();
|
|
||||||
mBinder.setOccluded(false /* isOccluded */, true /* animate */);
|
|
||||||
finishCallback.onTransitionFinished(null /* wct */, null /* wctCB */);
|
|
||||||
info.releaseAllSurfaces();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mergeAnimation(IBinder transition, TransitionInfo info,
|
|
||||||
SurfaceControl.Transaction t, IBinder mergeTarget,
|
|
||||||
IRemoteTransitionFinishedCallback finishCallback) {
|
|
||||||
t.close();
|
|
||||||
info.releaseAllSurfaces();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
private final IKeyguardService.Stub mBinder = new IKeyguardService.Stub() {
|
private final IKeyguardService.Stub mBinder = new IKeyguardService.Stub() {
|
||||||
private static final String TRACK_NAME = "IKeyguardService";
|
private static final String TRACK_NAME = "IKeyguardService";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user