Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7adbab6 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Save and restore the correct content type when rotating while in... 

Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf
parents 88416027 07e045c6

src/com/android/launcher3/Launcher.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

            }