The black frame is now a separate animation element. This allows us to have it move through the aspect ratio change, without the old and new screen elements doing weird aspect ratio scalings. This makes the animation generally look different (more like a reveal), not sure if it is better or worse, but definitely has less artifacts in things like the gallery. Also tweaked the animation definitions a bit. Change-Id: I94c274ba04bbc7a675946dc6c1778e19386e4a66
168 lines
6.0 KiB
Java
168 lines
6.0 KiB
Java
/*
|
|
* Copyright (C) 2011 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.server.wm;
|
|
|
|
import java.io.PrintWriter;
|
|
|
|
import android.graphics.Matrix;
|
|
import android.graphics.PixelFormat;
|
|
import android.graphics.Rect;
|
|
import android.util.Slog;
|
|
import android.view.Surface;
|
|
import android.view.SurfaceSession;
|
|
|
|
/**
|
|
* Four black surfaces put together to make a black frame.
|
|
*/
|
|
public class BlackFrame {
|
|
class BlackSurface {
|
|
final int left;
|
|
final int top;
|
|
final Surface surface;
|
|
|
|
BlackSurface(SurfaceSession session, int layer, int l, int t, int r, int b)
|
|
throws Surface.OutOfResourcesException {
|
|
left = l;
|
|
top = t;
|
|
int w = r-l;
|
|
int h = b-t;
|
|
surface = new Surface(session, 0, "BlackSurface",
|
|
-1, w, h, PixelFormat.OPAQUE, Surface.FX_SURFACE_DIM);
|
|
if (WindowManagerService.SHOW_TRANSACTIONS ||
|
|
WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG,
|
|
" BLACK " + surface + ": CREATE layer=" + layer);
|
|
surface.setAlpha(1.0f);
|
|
surface.setLayer(layer);
|
|
}
|
|
|
|
void setMatrix(Matrix matrix) {
|
|
mTmpMatrix.setTranslate(left, top);
|
|
mTmpMatrix.postConcat(matrix);
|
|
mTmpMatrix.getValues(mTmpFloats);
|
|
surface.setPosition(mTmpFloats[Matrix.MTRANS_X],
|
|
mTmpFloats[Matrix.MTRANS_Y]);
|
|
surface.setMatrix(
|
|
mTmpFloats[Matrix.MSCALE_X], mTmpFloats[Matrix.MSKEW_Y],
|
|
mTmpFloats[Matrix.MSKEW_X], mTmpFloats[Matrix.MSCALE_Y]);
|
|
if (false) {
|
|
Slog.i(WindowManagerService.TAG, "Black Surface @ (" + left + "," + top + "): ("
|
|
+ mTmpFloats[Matrix.MTRANS_X] + ","
|
|
+ mTmpFloats[Matrix.MTRANS_Y] + ") matrix=["
|
|
+ mTmpFloats[Matrix.MSCALE_X] + ","
|
|
+ mTmpFloats[Matrix.MSCALE_Y] + "]["
|
|
+ mTmpFloats[Matrix.MSKEW_X] + ","
|
|
+ mTmpFloats[Matrix.MSKEW_Y] + "]");
|
|
}
|
|
}
|
|
|
|
void clearMatrix() {
|
|
surface.setMatrix(1, 0, 0, 1);
|
|
}
|
|
}
|
|
|
|
final Rect mOuterRect;
|
|
final Rect mInnerRect;
|
|
final Matrix mTmpMatrix = new Matrix();
|
|
final float[] mTmpFloats = new float[9];
|
|
final BlackSurface[] mBlackSurfaces = new BlackSurface[4];
|
|
|
|
public void printTo(String prefix, PrintWriter pw) {
|
|
pw.print(prefix); pw.print("Outer: "); mOuterRect.printShortString(pw);
|
|
pw.print(" / Inner: "); mInnerRect.printShortString(pw);
|
|
pw.println();
|
|
for (int i=0; i<mBlackSurfaces.length; i++) {
|
|
BlackSurface bs = mBlackSurfaces[i];
|
|
pw.print(prefix); pw.print("#"); pw.print(i);
|
|
pw.print(": "); pw.print(bs.surface);
|
|
pw.print(" left="); pw.print(bs.left);
|
|
pw.print(" top="); pw.println(bs.top);
|
|
}
|
|
}
|
|
|
|
public BlackFrame(SurfaceSession session, Rect outer, Rect inner,
|
|
int layer) throws Surface.OutOfResourcesException {
|
|
boolean success = false;
|
|
|
|
mOuterRect = new Rect(outer);
|
|
mInnerRect = new Rect(inner);
|
|
try {
|
|
if (outer.top < inner.top) {
|
|
mBlackSurfaces[0] = new BlackSurface(session, layer,
|
|
outer.left, outer.top, inner.right, inner.top);
|
|
}
|
|
if (outer.left < inner.left) {
|
|
mBlackSurfaces[1] = new BlackSurface(session, layer,
|
|
outer.left, inner.top, inner.left, outer.bottom);
|
|
}
|
|
if (outer.bottom > inner.bottom) {
|
|
mBlackSurfaces[2] = new BlackSurface(session, layer,
|
|
inner.left, inner.bottom, outer.right, outer.bottom);
|
|
}
|
|
if (outer.right > inner.right) {
|
|
mBlackSurfaces[3] = new BlackSurface(session, layer,
|
|
inner.right, outer.top, outer.right, inner.bottom);
|
|
}
|
|
success = true;
|
|
} finally {
|
|
if (!success) {
|
|
kill();
|
|
}
|
|
}
|
|
}
|
|
|
|
public void kill() {
|
|
if (mBlackSurfaces != null) {
|
|
for (int i=0; i<mBlackSurfaces.length; i++) {
|
|
if (mBlackSurfaces[i] != null) {
|
|
if (WindowManagerService.SHOW_TRANSACTIONS ||
|
|
WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(
|
|
WindowManagerService.TAG,
|
|
" BLACK " + mBlackSurfaces[i].surface + ": DESTROY");
|
|
mBlackSurfaces[i].surface.destroy();
|
|
mBlackSurfaces[i] = null;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public void hide() {
|
|
if (mBlackSurfaces != null) {
|
|
for (int i=0; i<mBlackSurfaces.length; i++) {
|
|
if (mBlackSurfaces[i] != null) {
|
|
mBlackSurfaces[i].surface.hide();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public void setMatrix(Matrix matrix) {
|
|
for (int i=0; i<mBlackSurfaces.length; i++) {
|
|
if (mBlackSurfaces[i] != null) {
|
|
mBlackSurfaces[i].setMatrix(matrix);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void clearMatrix() {
|
|
for (int i=0; i<mBlackSurfaces.length; i++) {
|
|
if (mBlackSurfaces[i] != null) {
|
|
mBlackSurfaces[i].clearMatrix();
|
|
}
|
|
}
|
|
}
|
|
}
|