Merge branch 'eclair' into eclair-release
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ba3cc8a..9e78e7e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,8 +15,7 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- no translation found for application_name (8424725141379931883) -->
- <skip />
+ <string name="application_name" msgid="8424725141379931883">"启动程序"</string>
<string name="uid_name" msgid="3371120195364560632">"Android 核心应用程序"</string>
<string name="folder_name" msgid="4588446541914685904">"文件夹"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"选择壁纸来源"</string>
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 5efabb4..a1760de 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -214,6 +214,7 @@
mRollo.mHasSurface = true;
}
mRollo.dirtyCheck();
+ mRollo.resize(w, h);
mRS.mMessageCallback = mMessageProc = new AAMessage();
@@ -785,6 +786,7 @@
private ProgramVertex mPVOrtho;
private SimpleMesh mMesh;
private SimpleMesh mMesh2;
+ private ProgramVertex.MatrixAllocation mPVA;
private Allocation mHomeButtonNormal;
private Allocation mHomeButtonFocused;
@@ -916,15 +918,21 @@
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);