diff options
| author | Bart Sears <bsears@google.com> | 2012-11-02 15:34:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-02 15:34:02 -0700 |
| commit | b41864f13b83a4f2d92f601b2e4381762ad1effa (patch) | |
| tree | 1330cec41f22ddd9286e071de6ae035f7a529b72 | |
| parent | 3252800c7fe6bdb69b066eae0db739d06cfec64d (diff) | |
| parent | 19ded6d4283a887c579a29da3832dde286e97688 (diff) | |
| download | android_packages_apps_Gallery2-b41864f13b83a4f2d92f601b2e4381762ad1effa.tar.gz android_packages_apps_Gallery2-b41864f13b83a4f2d92f601b2e4381762ad1effa.tar.bz2 android_packages_apps_Gallery2-b41864f13b83a4f2d92f601b2e4381762ad1effa.zip | |
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 7 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java index 78fedd838..e28404fac 100644 --- a/src/com/android/gallery3d/app/Gallery.java +++ b/src/com/android/gallery3d/app/Gallery.java @@ -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) { diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index a48db37d8..41c86afc8 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -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 { |