PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d7adbab6: Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf

Browse Source 
* commit 'd7adbab669f922e02193eaf819ce32518dc70e8d':
  Save and restore the correct content type when rotating while in AllApps.
This commit is contained in:
Winson Chung
2013-11-07 12:02:09 -08:00
committed by Android Git Automerger
parent bc7d88eacb d7adbab669
commit be8ff1f407
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+3 -2
View File
@@ -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);
}