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

Commit 8788884b authored by Chao Zhang's avatar Chao Zhang Committed by Linux Build Service Account
Browse files

Gallery2: fix action bar display abnormal on timeline page. 

photo page is finished and return before update action bar,
so action bar is still grey color.
update action bar before finish photo page.

Change-Id: I790279c24ef95eeca5e06bf4825a0fb84503b2a7
CRs-Fixed: 1004554
parent 1e6342d9

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

+7 −7
Original line number Diff line number Diff line
@@ -1588,11 +1588,6 @@ public abstract class PhotoPage extends ActivityState implements 
    @Override

    protected void onResume() {

        super.onResume();



        if (mModel == null) {

            mActivity.getStateManager().finishState(this);

            return;

        }

        //set full screen to hide the status bar

        showFullScreen(true);
@@ -1616,8 +1611,7 @@ public abstract class PhotoPage extends ActivityState implements 
        if (mMediaSet != null && mIsFromTimelineScreen) {

            mMediaSet.setClusterKind(GalleryActivity.CLUSTER_ALBUMSET_NO_TITLE);

        }

        mModel.resume();

        mPhotoView.resume();



        mActionBar.setDisplayOptions(

                ((mSecureAlbum == null) && (mSetPathString != null)), true);

        mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener);
@@ -1643,6 +1637,12 @@ public abstract class PhotoPage extends ActivityState implements 


        mRecenterCameraOnResume = true;

        mHandler.sendEmptyMessageDelayed(MSG_UNFREEZE_GLROOT, UNFREEZE_GLROOT_TIMEOUT);

        if (mModel == null) {

            onBackPressed();

            return;

        }

        mModel.resume();

        mPhotoView.resume();

    }



    @Override