summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-11-06 15:49:51 -0800
committerWinson Chung <winsonc@google.com>2013-11-07 18:50:09 +0000
commit07e045c63775c944f00da037b5d9cfc31e6028dc (patch)
tree0495ecc1a9e99ce9bb3c274d176a746766a207fa /src/com/android/launcher3/Launcher.java
parentebb9ebed6407a6ff57dd3914d0fa99eb620aca2e (diff)
downloadandroid_packages_apps_Trebuchet-07e045c63775c944f00da037b5d9cfc31e6028dc.tar.gz
android_packages_apps_Trebuchet-07e045c63775c944f00da037b5d9cfc31e6028dc.tar.bz2
android_packages_apps_Trebuchet-07e045c63775c944f00da037b5d9cfc31e6028dc.zip
Save and restore the correct content type when rotating while in AllApps.
Change-Id: I508832e46c8a2ab3bb53baf8f44b543c4c24aed2
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0637b24f0..d52ef9f7e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -869,7 +869,7 @@ public class Launcher extends Activity
if (mOnResumeState == State.WORKSPACE) {
showWorkspace(false);
} else if (mOnResumeState == State.APPS_CUSTOMIZE) {
- showAllApps(false, AppsCustomizePagedView.ContentType.Applications, false);
+ showAllApps(false, mAppsCustomizeContent.getContentType(), false);
}
mOnResumeState = State.NONE;
@@ -1770,7 +1770,8 @@ public class Launcher extends Activity
// Save the current AppsCustomize tab
if (mAppsCustomizeTabHost != null) {
- String currentTabTag = mAppsCustomizeTabHost.getCurrentTabTag();
+ AppsCustomizePagedView.ContentType type = mAppsCustomizeContent.getContentType();
+ String currentTabTag = mAppsCustomizeTabHost.getTabTagForContentType(type);
if (currentTabTag != null) {
outState.putString("apps_customize_currentTab", currentTabTag);
}