diff options
author | Michael Jurka <mikejurka@google.com> | 2012-02-24 15:39:52 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 15:39:52 -0800 |
commit | 5f1c44ab0d7929f90ae8cd3504b4cff7ed057df4 (patch) | |
tree | 8bae4c13f1dd725c55dc8829455a8c163c02f9eb /src | |
parent | 325f7fef37aa11bedc78d9d0064437fa5413e0ac (diff) | |
parent | 6ee21d28fadef3b1bd594a0ac8708f40a24bdcd7 (diff) | |
download | android_packages_apps_Trebuchet-5f1c44ab0d7929f90ae8cd3504b4cff7ed057df4.tar.gz android_packages_apps_Trebuchet-5f1c44ab0d7929f90ae8cd3504b4cff7ed057df4.tar.bz2 android_packages_apps_Trebuchet-5f1c44ab0d7929f90ae8cd3504b4cff7ed057df4.zip |
Merge "Delaying building of hardware layers when Launcher is resumed"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index bd8fd8a86..97963a6dc 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -621,16 +621,6 @@ public final class Launcher extends Activity } @Override - protected void onStart() { - super.onStart(); - // When Launcher comes back to foreground, a different Activity might be responsible for - // the app market intent, so refresh the icon - // We don't do this in onResume() because onResume() is triggered every time the home - // button is pressed (even if we were already in Launcher) - updateAppMarketIcon(); - } - - @Override public Object onRetainNonConfigurationInstance() { // Flag the loader to stop early before switching mModel.stopLoader(); @@ -1118,18 +1108,21 @@ public final class Launcher extends Activity // apps is nice and speedy. Usually the first call to preDraw doesn't correspond to // a true draw so we wait until the second preDraw call to be safe observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { - boolean mFirstTime = true; public boolean onPreDraw() { - if (mFirstTime) { - mFirstTime = false; - } else { - //workspace.post(mBuildLayersRunnable); - observer.removeOnPreDrawListener(this); - } + // We delay the layer building a bit in order to give + // other message processing a time to run. In particular + // this avoids a delay in hiding the IME if it was + // currently shown, because doing that may involve + // some communication back with the app. + workspace.postDelayed(mBuildLayersRunnable, 500); + observer.removeOnPreDrawListener(this); return true; } }); } + // When Launcher comes back to foreground, a different Activity might be responsible for + // the app market intent, so refresh the icon + updateAppMarketIcon(); clearTypedText(); } } @@ -3194,7 +3187,7 @@ public final class Launcher extends Activity // package changes in bindSearchablesChanged() updateAppMarketIcon(); - mWorkspace.post(mBuildLayersRunnable); + mWorkspace.postDelayed(mBuildLayersRunnable, 500); } @Override |