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

Commit b41864f1 authored by Bart Sears's avatar Bart Sears Committed by Android (Google) Code Review
Browse files

Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

parents 3252800c 19ded6d4

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

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.provider.OpenableColumns;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Toast;



import com.android.gallery3d.R;
@@ -48,6 +49,7 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi 
    public static final String KEY_GET_ALBUM = "get-album";

    public static final String KEY_TYPE_BITS = "type-bits";

    public static final String KEY_MEDIA_TYPES = "mediaTypes";

    public static final String KEY_DISMISS_KEYGUARD = "dismiss-keyguard";



    private static final String TAG = "Gallery";

    private Dialog mVersionCheckDialog;
@@ -58,6 +60,11 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi 
        requestWindowFeature(Window.FEATURE_ACTION_BAR);

        requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);



        if (getIntent().getBooleanExtra(KEY_DISMISS_KEYGUARD, false)) {

            getWindow().addFlags(

                    WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);

        }



        setContentView(R.layout.main);



        if (savedInstanceState != null) {

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

+3 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,9 @@ public class PhotoPage extends ActivityState implements 
        } else if (goBack) {

            onBackPressed();

        } else if (unlock) {

            mActivity.getStateManager().finishState(this);

            Intent intent = new Intent(mActivity, Gallery.class);

            intent.putExtra(Gallery.KEY_DISMISS_KEYGUARD, true);

            mActivity.startActivity(intent);

        } else if (launchCamera) {

            launchCamera();

        } else {