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

Commit 5d3e6653 authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

parents f46da69a 5b1e444b

src/com/android/gallery3d/app/AlbumPage.java

+0 −8
Original line number Diff line number Diff line
@@ -454,14 +454,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster 
            clearLoadingBit(BIT_LOADING_SYNC);

        }

        mActionModeHandler.pause();



        // The camera app should always launch in capture mode when

        // resumed, so make the next resume faster by closing the grid

        // view now

        if (mInCameraAndWantQuitOnPause) {

            if (mActivity.getStateManager().getTopState() == this)

                mActivity.getStateManager().finishState(this, false);

        }

    }



    @Override

src/com/android/gallery3d/app/StateManager.java

+7 −0
Original line number Diff line number Diff line
@@ -160,6 +160,13 @@ public class StateManager { 
        finishState(state, true);

    }



    public void clearTasks() {

        // Remove all the states that are on top of the bottom PhotoPage state

        while (mStack.size() > 1) {

            mStack.pop().activityState.onDestroy();

        }

    }



    void finishState(ActivityState state, boolean fireOnPause) {

        // The finish() request could be rejected (only happens under Monkey),

        // If it is rejected, we won't close the last page.