diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-07-07 17:01:08 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2011-07-07 17:01:08 -0700 |
| commit | 35aa14d5e33e4f5cccb9fd23be1047f26d67b409 (patch) | |
| tree | ce034d3bae13ad7e341b71e64f567a0f7f65eede | |
| parent | eb99f1648c63ad35e1a528e566aa47df581864f8 (diff) | |
| download | android_packages_apps_Trebuchet-35aa14d5e33e4f5cccb9fd23be1047f26d67b409.tar.gz android_packages_apps_Trebuchet-35aa14d5e33e4f5cccb9fd23be1047f26d67b409.tar.bz2 android_packages_apps_Trebuchet-35aa14d5e33e4f5cccb9fd23be1047f26d67b409.zip | |
Don't reset pages in AllApps if not necessary
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 888d3d38c..90f28158a 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -1137,6 +1137,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen addAppsWithoutInvalidate(list); invalidatePageData(); } + @Override public void reset() { if (mContentType != ContentType.Applications) { @@ -1144,7 +1145,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen AppsCustomizeTabHost tabs = (AppsCustomizeTabHost) mLauncher.findViewById(R.id.apps_customize_pane); tabs.setCurrentTabByTag(tabs.getTabTagForContentType(ContentType.Applications)); - } else { + } else if (getCurrentPage() != 0) { setCurrentPage(0); invalidatePageData(); } diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 5c9e4dd76..6f64f9d57 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1284,7 +1284,7 @@ public final class Launcher extends Activity imm.hideSoftInputFromWindow(v.getWindowToken(), 0); } - // Reset AllApps to it's initial state + // Reset AllApps to its initial state if (mAppsCustomizeContent != null) { mAppsCustomizeContent.reset(); } |