diff options
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 76e050a75..ca3ee19ab 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -17,6 +17,7 @@ package com.android.gallery3d.app; import android.annotation.TargetApi; +import android.app.ActionBar.OnMenuVisibilityListener; import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Context; @@ -31,15 +32,13 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.SystemClock; +import android.view.Menu; +import android.view.MenuItem; import android.widget.RelativeLayout; import android.widget.Toast; import com.android.camera.CameraActivity; import com.android.camera.ProxyLauncher; - -import com.actionbarsherlock.app.ActionBar.OnMenuVisibilityListener; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.data.ComboAlbum; @@ -305,7 +304,9 @@ public abstract class PhotoPage extends ActivityState implements break; } case MSG_ON_FULL_SCREEN_CHANGED: { - mAppBridge.onFullScreenChanged(message.arg1 == 1); + if (mAppBridge != null) { + mAppBridge.onFullScreenChanged(message.arg1 == 1); + } break; } case MSG_UPDATE_ACTION_BAR: { @@ -1166,7 +1167,9 @@ public abstract 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 { |