diff options
Diffstat (limited to 'src/com/android/gallery3d/app/Gallery.java')
| -rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java index e28404fac..354e325d4 100644 --- a/src/com/android/gallery3d/app/Gallery.java +++ b/src/com/android/gallery3d/app/Gallery.java @@ -26,10 +26,9 @@ import android.database.Cursor; 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.actionbarsherlock.view.Window; import com.android.gallery3d.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; @@ -49,7 +48,6 @@ 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; @@ -60,11 +58,6 @@ 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) { @@ -222,7 +215,7 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi } } - getStateManager().startState(PhotoPage.class, data); + getStateManager().startState(SinglePhotoPage.class, data); } } } |