am 5612e432: Fix duplicated text when returning home from an app that hid the status bar and launcher2 was killed.

Merge commit '5612e4321e637a4b6278dc6abff215812d8dc998' into eclair-mr2

* commit '5612e4321e637a4b6278dc6abff215812d8dc998':
  Fix duplicated text when returning home from an app that hid the status bar and launcher2 was killed.
This commit is contained in:
Jason Sams
2009-11-16 14:54:17 -08:00
committed by Android Git Automerger
+11 -3
View File
@@ -214,6 +214,7 @@ public class AllAppsView extends RSSurfaceView
mRollo.mHasSurface = true;
}
mRollo.dirtyCheck();
mRollo.resize(w, h);
mRS.mMessageCallback = mMessageProc = new AAMessage();
@@ -783,6 +784,7 @@ public class AllAppsView extends RSSurfaceView
private ProgramVertex mPVOrtho;
private SimpleMesh mMesh;
private SimpleMesh mMesh2;
private ProgramVertex.MatrixAllocation mPVA;
private Allocation mHomeButtonNormal;
private Allocation mHomeButtonFocused;
@@ -914,15 +916,21 @@ public class AllAppsView extends RSSurfaceView
mMesh2.setName("SMMesh");
}
void resize(int w, int h) {
mPVA.setupProjectionNormalized(w, h);
mWidth = w;
mHeight = h;
}
private void initProgramVertex() {
ProgramVertex.MatrixAllocation pva = new ProgramVertex.MatrixAllocation(mRS);
pva.setupProjectionNormalized(mWidth, mHeight);
mPVA = new ProgramVertex.MatrixAllocation(mRS);
resize(mWidth, mHeight);
ProgramVertex.Builder pvb = new ProgramVertex.Builder(mRS, null, null);
pvb.setTextureMatrixEnable(true);
mPV = pvb.create();
mPV.setName("PV");
mPV.bindAllocation(pva);
mPV.bindAllocation(mPVA);
//pva = new ProgramVertex.MatrixAllocation(mRS);
//pva.setupOrthoWindow(mWidth, mHeight);