diff --git a/apps/camera/js/controllers/preview-gallery.js b/apps/camera/js/controllers/preview-gallery.js
index 91521be0bd6d..d45d1ae4bf76 100644
--- a/apps/camera/js/controllers/preview-gallery.js
+++ b/apps/camera/js/controllers/preview-gallery.js
@@ -66,7 +66,7 @@ PreviewGalleryController.prototype.openPreview = function() {
   this.view.on('click:share', this.shareCurrentItem);
   this.view.on('click:delete', this.deleteCurrentItem);
   this.view.on('click:back', this.closePreview);
-  this.view.on('itemChange', this.handleItemChange);
+  this.view.on('swipe', this.handleSwipe);
 
   // If lockscreen is locked, hide all control buttons
   var secureMode = this.app.inSecureMode;
@@ -204,15 +204,12 @@ PreviewGalleryController.prototype.updatePreviewGallery = function(index) {
 /**
  * To Do: Image Swipe Transition
  */
-PreviewGalleryController.prototype.handleItemChange = function(e) {
-  var direction = e.detail.direction;
-  switch (direction) {
-  case 'left': // go to next image
+PreviewGalleryController.prototype.handleSwipe = function(direction) {
+  if (direction === 'left') {
     this.next();
-    break;
-  case 'right': // go to previous
+  }
+  else if (direction === 'right') {
     this.previous();
-    break;
   }
 };
 
diff --git a/apps/camera/js/lib/orientation.js b/apps/camera/js/lib/orientation.js
index 050a7e6ad1cb..6e4f0d9a0bf6 100644
--- a/apps/camera/js/lib/orientation.js
+++ b/apps/camera/js/lib/orientation.js
@@ -15,6 +15,25 @@ define(function(require, exports, module) {
     current = degrees;
   }
 
+  // Camera normally has its orientation locked to portrait mode.
+  // But we unlock orientation when displaying image and video previews.
+  // When orientation is unlocked, we call listener.stop().
+  // We calls call stop() when recording a video, and then restart
+  // when recording is done. If our app ever changes so that we can call
+  // unlock while the orientation listener is in the stopped state, then
+  // we would need to modify the lock() function so that it did not
+  // restart the listener. That is not needed now, however and is omitted.
+
+  function unlock() {
+    screen.mozUnlockOrientation();
+    listener.stop();
+  }
+
+  function lock() {
+    screen.mozLockOrientation('portrait-primary');
+    listener.start();
+  }
+
   /**
    * Exports
    */
@@ -24,6 +43,8 @@ define(function(require, exports, module) {
     off: listener.off,
     start: listener.start,
     stop: listener.stop,
+    unlock: unlock,
+    lock: lock,
     get: function() {
       return current;
     }
diff --git a/apps/camera/js/lib/panzoom.js b/apps/camera/js/lib/panzoom.js
index 436771edded1..4e46fa7c4f42 100644
--- a/apps/camera/js/lib/panzoom.js
+++ b/apps/camera/js/lib/panzoom.js
@@ -6,7 +6,6 @@ define(function(require, exports, module) {
  */
 
 var GestureDetector = require('GestureDetector');
-var orientation = require('lib/orientation');
 
 /**
  * Exports
@@ -16,22 +15,33 @@ module.exports = addPanAndZoomHandlers;
 
 /*
  * This module adds pan-and-zoom capability to images displayed by
- * shared/js/media/media_frame.js.  
+ * shared/js/media/media_frame.js.
  * It is used by preview-gallery.js and confirm.js
  */
-function addPanAndZoomHandlers(frame) {
-  // frame is the MediaFrame object. container is its the DOM element.
+function addPanAndZoomHandlers(frame, swipeCallback) {
+  // frame is the MediaFrame object. container is its DOM element.
   var container = frame.container;
 
   // Generate gesture events for the container
   var gestureDetector = new GestureDetector(container);
   gestureDetector.startDetecting();
 
+  // When the user touches the screen and moves their finger left or
+  // right, they might want to pan within a zoomed-in image, or they
+  // might want to swipe between multiple items in the camera preview
+  // gallery. We pass the amount of motion to the MediaFrame pan() method,
+  // and it returns the amount that cannot be used to pan the displayed
+  // item. We track this returned amount as how far left or right the
+  // image has been swiped, and pass the number to the swipeCallback.
+  var swipeAmount = 0;
+
   // And handle them with these listeners
   container.addEventListener('dbltap', handleDoubleTap);
   container.addEventListener('transform', handleTransform);
   container.addEventListener('pan', handlePan);
-  container.addEventListener('swipe', handleSwipe);
+  if (swipeCallback) {
+    container.addEventListener('swipe', handleSwipe);
+  }
 
   function handleDoubleTap(e) {
     var scale;
@@ -42,104 +52,32 @@ function addPanAndZoomHandlers(frame) {
       scale = 2;
     }
 
-    // If the phone orientation is 0 (unrotated) then the gesture detector's
-    // event coordinates match what's on the screen, and we use them to
-    // specify a point to zoom in or out on. For other orientations we could
-    // calculate the correct point, but instead just use the midpoint.
-    var x, y;
-    if (orientation.get() === 0) {
-      x = e.detail.clientX;
-      y = e.detail.clientY;
-    }
-    else {
-      x = container.offsetWidth / 2;
-      y = container.offsetHeight / 2;
-    }
-
-    frame.zoom(scale, x, y, 200);
+    frame.zoom(scale, e.detail.clientX, e.detail.clientY, 200);
   }
 
   function handleTransform(e) {
-    // If the phone orientation is 0 (unrotated) then the gesture detector's
-    // event coordinates match what's on the screen, and we use them to
-    // specify a point to zoom in or out on. For other orientations we could
-    // calculate the correct point, but instead just use the midpoint.
-    var x, y;
-    if (orientation.get() === 0) {
-      x = e.detail.midpoint.clientX;
-      y = e.detail.midpoint.clientY;
-    }
-    else {
-      x = container.offsetWidth / 2;
-      y = container.offsetHeight / 2;
-    }
-
-    frame.zoom(e.detail.relative.scale, x, y);
+    frame.zoom(e.detail.relative.scale,
+               e.detail.midpoint.clientX, e.detail.midpoint.clientY);
   }
 
   function handlePan(e) {
-    // The gesture detector event does not take our CSS rotation into
-    // account, so we have to pan by a dx and dy that depend on how
-    // the MediaFrame is rotated
-    var dx, dy;
-    switch (orientation.get()) {
-    case 0:
-      dx = e.detail.relative.dx;
-      dy = e.detail.relative.dy;
-      break;
-    case 90:
-      dx = -e.detail.relative.dy;
-      dy = e.detail.relative.dx;
-      break;
-    case 180:
-      dx = -e.detail.relative.dx;
-      dy = -e.detail.relative.dy;
-      break;
-    case 270:
-      dx = e.detail.relative.dy;
-      dy = -e.detail.relative.dx;
-      break;
+    var dx = e.detail.relative.dx;
+    var dy = e.detail.relative.dy;
+
+    if (swipeCallback) {
+      dx += swipeAmount;
+      swipeAmount = frame.pan(dx, dy);
+      swipeCallback(swipeAmount);
+    } else {
+      frame.pan(dx, dy);
     }
-
-    frame.pan(dx, dy);
   }
 
   function handleSwipe(e) {
-    var direction = e.detail.direction;
-    switch (orientation.get()) {
-    case 90:
-      switch (e.detail.direction) {
-        case 'up': direction = 'right'; break;
-        case 'down': direction = 'left'; break;
-        case 'left': direction = 'up'; break;
-        case 'right': direction = 'down'; break;
-      }
-      break;
-    case 180:
-      switch (e.detail.direction) {
-        case 'up': direction = 'down'; break;
-        case 'down': direction = 'up'; break;
-        case 'left': direction = 'right'; break;
-        case 'right': direction = 'left'; break;
-      }
-      break;
-    case 270:
-      switch (e.detail.direction) {
-        case 'up': direction = 'left'; break;
-        case 'down': direction = 'right'; break;
-        case 'left': direction = 'down'; break;
-        case 'right': direction = 'up'; break;
-      }
-      break;
+    if (swipeAmount !== 0) {
+      swipeCallback(swipeAmount, e.detail.vx);
+      swipeAmount = 0;
     }
-    e.detail.direction = direction;
-
-    var itemChangeEvent = new CustomEvent('orientationSwipe', {
-      detail: e.detail
-    });
-    /*jshint validthis:true */
-    this.dispatchEvent(itemChangeEvent);
-
   }
 }
 
diff --git a/apps/camera/js/vendor/orientation.js b/apps/camera/js/vendor/orientation.js
index 14f011fbea15..bc75c2eed45f 100644
--- a/apps/camera/js/vendor/orientation.js
+++ b/apps/camera/js/vendor/orientation.js
@@ -23,7 +23,7 @@ define(function() {
 
   var lastMotionFilteredTime = 0;
   var lastMotionData = {x: 0, y: 0, z: 0, t: 0};
-  var pendingOrientation = 0;
+  var pendingOrientation = null;
   var orientationChangeTimer = 0;
   var eventListeners = {'orientation': []};
 
@@ -123,20 +123,35 @@ define(function() {
       window.clearTimeout(orientationChangeTimer);
     }
 
-    // create timer for waiting to rotate the phone
-    pendingOrientation = orientation;
-    orientationChangeTimer = window.setTimeout(function doOrient() {
+    // If we don't have any current orientation, then send an event right away
+    // Otherwise, wait to make sure we're stable before sending it.
+    if (pendingOrientation === null) {
+      pendingOrientation = orientation;
       fireOrientationChangeEvent(pendingOrientation);
-      orientationChangeTimer = 0;
-    }, ORIENTATION_CHANGE_INTERVAL);
+    }
+    else {
+      // create timer for waiting to rotate the phone
+      pendingOrientation = orientation;
+      orientationChangeTimer = window.setTimeout(function doOrient() {
+        fireOrientationChangeEvent(pendingOrientation);
+        orientationChangeTimer = 0;
+      }, ORIENTATION_CHANGE_INTERVAL);
+    }
   }
 
   function start() {
+    // Reset our state so that the first devicemotion event we get
+    // will always generate an orientation event.
+    pendingOrientation = null;
     window.addEventListener('devicemotion', handleMotionEvent);
   }
 
   function stop() {
     window.removeEventListener('devicemotion', handleMotionEvent);
+    if (orientationChangeTimer) {
+      clearTimeout(orientationChangeTimer);
+      orientationChangeTimer = 0;
+    }
   }
 
   function addEventListener(type, listener) {
diff --git a/apps/camera/js/views/confirm.js b/apps/camera/js/views/confirm.js
index 2086699d03aa..6dc34b715d46 100644
--- a/apps/camera/js/views/confirm.js
+++ b/apps/camera/js/views/confirm.js
@@ -9,6 +9,7 @@ var addPanAndZoomHandlers = require('lib/panzoom');
 var MediaFrame = require('MediaFrame');
 var View = require('vendor/view');
 var bind = require('lib/bind');
+var orientation = require('lib/orientation');
 
 /**
  * Exports
@@ -47,15 +48,18 @@ module.exports = View.extend({
   setupMediaFrame: function() {
     this.mediaFrame = new MediaFrame(this.els.mediaFrame);
     addPanAndZoomHandlers(this.mediaFrame);
+    window.addEventListener('resize', this.onResize);
     return this;
   },
 
   hide: function() {
     this.el.classList.add('hidden');
+    orientation.lock();
   },
 
   show: function() {
     this.el.classList.remove('hidden');
+    orientation.unlock();
   },
 
   showImage: function(image) {
@@ -96,7 +100,15 @@ module.exports = View.extend({
     this.emit('click:' + name);
   },
 
+  onResize: function() {
+    this.mediaFrame.resize();
+    if (this.mediaFrame.displayingVideo) {
+      this.mediaFrame.video.setPlayerSize();
+    }
+  },
+
   onDestroy: function() {
+    window.removeEventListener('resize', this.onResize);
     this.mediaFrame.clear();
   }
 });
diff --git a/apps/camera/js/views/preview-gallery.js b/apps/camera/js/views/preview-gallery.js
index 69232b0796d3..bc5eb4721243 100644
--- a/apps/camera/js/views/preview-gallery.js
+++ b/apps/camera/js/views/preview-gallery.js
@@ -13,6 +13,16 @@ var orientation = require('lib/orientation');
 var addPanAndZoomHandlers = require('lib/panzoom');
 var MediaFrame = require('MediaFrame');
 
+/**
+ * Constants
+ */
+var SWIPE_DISTANCE_THRESHOLD = window.innerWidth / 3; // pixels
+var SWIPE_VELOCITY_THRESHOLD = 1.0;                   // pixels/ms
+
+var SWIPE_DURATION = 250;   // How long to animate the swipe
+var FADE_IN_DURATION = 500; // How long to animate the fade in after swipe
+
+
 /**
  * Locals
  */
@@ -34,10 +44,8 @@ return View.extend({
     this.els.previewMenu = this.find('.js-preview-menu');
 
     bind(this.el, 'click', this.onClick);
-    bind(this.els.mediaFrame, 'orientationSwipe', this.orientationSwipe);
     attach.on(this.els.previewMenu, 'click', '.js-btn', this.onButtonClick);
 
-    orientation.on('orientation', this.setOrientation);
     this.configure();
     return this;
   },
@@ -55,8 +63,8 @@ return View.extend({
     bind(this.els.player, 'pause', this.handleVideoStop);
     bind(this.els.player, 'ended', this.handleVideoStop);
 
-    this.items = [];
-    addPanAndZoomHandlers(this.frame);
+    this.currentIndex = this.lastIndex = 0;
+    addPanAndZoomHandlers(this.frame, this.swipeCallback);
   },
 
   template: function() {
@@ -65,7 +73,7 @@ return View.extend({
       '<div class="media-frame js-media-frame"></div>' +
       '</div>' +
       '<div class="preview-menu js-preview-menu">' +
-        '<div class="camera-back icon-camera-back rotates js-btn" name="back"></div>' +
+        '<div class="camera-back icon-camera-back js-btn" name="back"></div>' +
         '<div class="count-text js-count-text"></div>' +
         '<footer class="preview-controls js-preview">' +
           '<div class="preview-gallery-button js-btn" name="gallery">' +
@@ -100,11 +108,98 @@ return View.extend({
     this.els.previewMenu.classList.remove('visible');
   },
 
-  orientationSwipe: function(e) {
+  swipeCallback: function(swipeAmount, swipeVelocity) {
+    var self = this;
+
+    if (swipeVelocity === undefined) {
+      // If this is not the end of the gesture, then just move the media
+      // frame left or right by the specified amount.
+      this.els.frameContainer.style.transform =
+        'translate(' + swipeAmount + 'px, 0)';
+      return;
+    }
+
+    // If we were passed a velocity, then this is the end of the gesture
+    // and we have to figure out whether we are going to go to the
+    // next item, the previous item, or remain on the current item.
+    var direction, translation;
+
+    // Should we move to the previous item?
+    if (swipeAmount > 0 && swipeVelocity > 0 &&     // Same sign and
+        this.currentIndex > 1 &&                    // has previous item and
+        (swipeAmount > SWIPE_DISTANCE_THRESHOLD ||  // distance big enough or
+         swipeVelocity > SWIPE_VELOCITY_THRESHOLD)) // speed fast enough
+    {
+      direction = 'right';
+      translation = '100%';
+    }
+    // Should we move to the next item?
+    else if (swipeAmount <= 0 && swipeVelocity <= 0 &&
+             this.currentIndex < this.lastIndex &&
+             (swipeAmount < -SWIPE_DISTANCE_THRESHOLD ||
+              swipeVelocity < -SWIPE_VELOCITY_THRESHOLD)) {
+      direction = 'left';
+      translation = '-100%';
+    }
+
+    // If we're not moving either left or right, just animate the
+    // item to its starting point and we're done.
+    if (!direction) {
+      animate('transform', 'translate(0,0)', SWIPE_DURATION);
+      return;
+    }
+
+    // If we get here, we are going to slide the current item off the screen
+    // and display the next or previous item.
+
+    // First, stop the video if there is one and it is playing.
     if (this.videoPlaying) {
       this.handleVideoStop();
     }
-    this.emit('itemChange', e);
+
+    // Now animate the item off the screen
+    animate('transform', 'translate(' + translation + ', 0)',
+            SWIPE_DURATION,
+            function() {
+              // Once we're off screen ask the controller to
+              // switch to the new image.
+              self.emit('swipe', direction);
+
+              // On the next redraw, put the frame back on the screen
+              // but make it opaque
+              window.requestAnimationFrame(function() {
+                // Next, make the frame invisible
+                // and put it back on the screen
+                self.els.frameContainer.style.opacity = 0;
+                self.els.frameContainer.style.transform = 'translate(0,0)';
+
+                // Then on the frame after that, animate the opacity to
+                // make it visible again.
+                window.requestAnimationFrame(function() {
+                  animate('opacity', 1, FADE_IN_DURATION);
+                });
+              });
+            });
+
+    // A helper function to animate the specified CSS property to the
+    // specified value for the specified duration. When the animation
+    // is complete, reset everything and call the done callback
+    function animate(property, value, duration, done) {
+      var e = self.els.frameContainer;
+      e.addEventListener('transitionend', onTransitionEnd);
+      e.style.transitionProperty = property;
+      e.style.transitionDuration = duration + 'ms';
+      e.style[property] = value;
+
+      function onTransitionEnd() {
+        e.removeEventListener('transitionend', onTransitionEnd);
+        delete e.style.transitionProperty;
+        delete e.style.transitionDuration;
+        if (done) {
+          done();
+        }
+      }
+    }
   },
 
   onButtonClick: function(e, el) {
@@ -114,28 +209,32 @@ return View.extend({
   },
 
   open: function() {
-    this.setOrientation(orientation.get());
+    window.addEventListener('resize', this.onResize);
+    orientation.unlock();
     this.previewMenuFadeIn();
     this.el.classList.remove('offscreen');
   },
 
   close: function() {
+    window.removeEventListener('resize', this.onResize);
+    orientation.lock();
     this.previewMenuFadeOut();
     this.el.classList.add('offscreen');
     this.frame.clear();
   },
 
   updateCountText: function(current, total) {
+    this.currentIndex = current;
+    this.lastIndex = total;
     this.els.countText.textContent = current + '/' + total;
   },
 
-  setOrientation: function(orientation) {
+  onResize: function() {
     // And we have to resize the frame (and its video player)
     this.frame.resize();
-    this.frame.video.setPlayerSize();
-
-    // And inform the video player of new orientation
-    this.frame.video.setPlayerOrientation(orientation);
+    if (this.frame.displayingVideo) {
+      this.frame.video.setPlayerSize();
+    }
   },
 
   showImage: function(image) {
@@ -167,7 +266,6 @@ return View.extend({
     this.videoPlaying = false;
     setTimeout(this.previewMenuFadeIn, 300);
   }
-
 });
 
 });
diff --git a/apps/camera/style/preview-gallery.css b/apps/camera/style/preview-gallery.css
index 8a7cca9634c8..0a4f486cfb73 100644
--- a/apps/camera/style/preview-gallery.css
+++ b/apps/camera/style/preview-gallery.css
@@ -10,6 +10,7 @@
   opacity: 1;
   visibility: visible;
   transition: all 0.5s ease-in-out;
+  background-color: #333333;
 }
 
 .preview-gallery.offscreen {
@@ -40,38 +41,6 @@
   background-color: #333333;
 }
 
-/**
- * @deg90
- */
-
-.deg90 .media-frame {
-  width: 100vh;
-  height: 100vw;
-  top: calc((100vh - 100vw) / 2);
-  left: calc((100vw - 100vh) / 2);
-  transform: rotate(-90deg);
-}
-
-/**
- * @deg180
- */
-
-.deg180 .media-frame {
-  transform: rotate(-180deg);
-}
-
-/**
- * @deg270
- */
-
-.deg270 .media-frame {
-  width: 100vh;
-  height: 100vw;
-  top: calc((100vh - 100vw) / 2);
-  left: calc((100vw - 100vh) / 2);
-  transform: rotate(-270deg);
-}
-
 .media-frame > img {
   top: 0;
   left: 0;
@@ -118,31 +87,6 @@
   color: #fff;
 }
 
-/**
- * @deg90
- */
-
-.deg90 .camera-back {
-  bottom: 0;
-}
-
-/**
- * @deg180
- */
-
-.deg180 .camera-back {
-  bottom: 0;
-  right: 0;
-}
-
-/**
- * @deg270
- */
-.deg270 .camera-back {
-  top: 0;
-  right: 0;
-}
-
 .count-text {
   position: absolute;
   bottom: 83px;
@@ -156,40 +100,6 @@
   color: #FFF;
 }
 
-/**
- * @deg90
- */
-
-.deg90 .count-text {
-  width: 100vh;
-  bottom: 0;
-  left: calc(100% - 83px);
-  transform-origin: left bottom;
-  transform: rotate(-90deg);
-}
-
-/**
- * @deg180
- */
-
-.deg180 .count-text {
-  top: 83px;
-  bottom: auto;
-  transform: rotate(-180deg);
-}
-
-/**
- * @deg270
- */
-
-.deg270 .count-text {
-  width: 100vh;
-  top: 0;
-  left: calc(83px + 2rem);
-  transform-origin: left top;
-  transform: rotate(-270deg);
-}
-
 /** Preview Controls
  ---------------------------------------------------------*/
 
@@ -205,38 +115,6 @@
   z-index: 100;
 }
 
-/**
- * @deg90
- */
-
-.deg90 .preview-controls {
-  width: 100vh;
-  left: 100%;
-  transform-origin: left bottom;
-  transform: rotate(-90deg);
-}
-
-/**
- * @deg180
- */
-
-.deg180 .preview-controls {
-  top: 0;
-  transform: rotate(-180deg);
-}
-
-/**
- * @deg270
- */
-
-.deg270 .preview-controls {
-  width: 100vh;
-  top: 0;
-  left: 4.5rem;
-  transform-origin: left top;
-  transform: rotate(-270deg);
-}
-
 /* TD DO common
 .preview-controls > * {
   display: flex;
diff --git a/apps/camera/test/unit/controllers/preview-gallery_test.js b/apps/camera/test/unit/controllers/preview-gallery_test.js
index f2d68b0cb72b..dcd0ebda3376 100644
--- a/apps/camera/test/unit/controllers/preview-gallery_test.js
+++ b/apps/camera/test/unit/controllers/preview-gallery_test.js
@@ -12,10 +12,11 @@ suite('controllers/preview-gallery', function() {
       'lib/settings',
       'views/preview-gallery',
       'views/controls',
-      'lib/storage'
+      'lib/storage',
+      'lib/orientation'
     ], function(
       App, Camera, PreviewGalleryController, Settings, PreviewGalleryView,
-      ControlsView, Storage) {
+      ControlsView, Storage, orientation) {
       self.PreviewGalleryController =
          PreviewGalleryController.PreviewGalleryController;
       self.Settings = Settings;
@@ -24,6 +25,7 @@ suite('controllers/preview-gallery', function() {
       self.Storage = Storage;
       self.Camera = Camera;
       self.App = App;
+      self.orientation = orientation;
       done();
     });
   });
@@ -204,31 +206,40 @@ suite('controllers/preview-gallery', function() {
       assert.ok(this.previewGalleryController.updatePreviewGallery.called);
     });
 
-    test('Should go to next image when onItemChange is \'left\'', function() {
-      var e = {
-        detail: {
-          direction: 'left',
-          vx: -2
-        }
-      };
-      this.previewGalleryController.currentItemIndex = -2;
+    test('Should go to next image on handleSwipe(\'left\')', function() {
+      this.previewGalleryController.items = [1,2,3];
+      this.previewGalleryController.currentItemIndex = 1;
       this.previewGalleryController.previewItem = sinon.spy();
-      this.previewGalleryController.handleItemChange(e);
+      this.previewGalleryController.handleSwipe('left');
       assert.ok(this.previewGalleryController.previewItem.called);
+      assert.equal(this.previewGalleryController.currentItemIndex, 2);
     });
 
-    test('Should go to previous image when onItemChange is \'right\'',
-      function() {
-        var e = {
-          detail: {
-            direction: 'right',
-            vx: 2
-          }
-        };
-      this.previewGalleryController.currentItemIndex = 2;
+    test('Should go to previous image on handleSwipe(\'right\')', function() {
+      this.previewGalleryController.items = [1,2,3];
+      this.previewGalleryController.currentItemIndex = 1;
       this.previewGalleryController.previewItem = sinon.spy();
-      this.previewGalleryController.handleItemChange(e);
+      this.previewGalleryController.handleSwipe('right');
       assert.ok(this.previewGalleryController.previewItem.called);
+      assert.equal(this.previewGalleryController.currentItemIndex, 0);
+    });
+
+    test('Should not go to next image if there is not one', function() {
+      this.previewGalleryController.items = [1,2];
+      this.previewGalleryController.currentItemIndex = 1;
+      this.previewGalleryController.previewItem = sinon.spy();
+      this.previewGalleryController.handleSwipe('left');
+      assert.isFalse(this.previewGalleryController.previewItem.called);
+      assert.equal(this.previewGalleryController.currentItemIndex, 1);
+    });
+
+    test('Should not go to previous image if there is not one', function() {
+      this.previewGalleryController.items = [1,2];
+      this.previewGalleryController.currentItemIndex = 0;
+      this.previewGalleryController.previewItem = sinon.spy();
+      this.previewGalleryController.handleSwipe('right');
+      assert.isFalse(this.previewGalleryController.previewItem.called);
+      assert.equal(this.previewGalleryController.currentItemIndex, 0);
     });
 
     test('Should close the preview on blur', function() {
@@ -248,6 +259,32 @@ suite('controllers/preview-gallery', function() {
       assert.ok(this.previewGalleryController.closePreview.calledAfter(this.previewGalleryController.updateThumbnail));
     });
 
+    // XXX: this is really a view test, but we don't have tests for the view yet
+    test('Should lock and unlock orientation when opening and closing view',
+         function() {
+           this.orientation.unlock = sinon.spy();
+           this.orientation.lock = sinon.spy();
+           this.previewGalleryController.previewItem = sinon.spy();
+           this.previewGalleryController.openPreview();
+           assert.isTrue(this.orientation.unlock.called);
+           assert.isTrue(this.previewGalleryController.previewItem.called);
+           assert.isFalse(this.orientation.lock.called);
+           this.previewGalleryController.closePreview();
+           assert.isTrue(this.orientation.lock.called);
+         });
+
+    // XXX: this is really a view test, but we don't have tests for the view yet
+    test('Should add and remove a resize handler when opening and closing view',
+         function() {
+           var add = sinon.spy(window, 'addEventListener').withArgs('resize');
+           var remove =
+             sinon.spy(window, 'removeEventListener').withArgs('resize');
+           this.previewGalleryController.previewItem = sinon.spy();
+           this.previewGalleryController.openPreview();
+           assert.ok(add.calledTwice); // twice because VideoPlayer does too
+           this.previewGalleryController.closePreview();
+           assert.equal(remove.callCount, 1);
+         });
   });
 
   suite('PreviewGalleryController#openPreview()', function() {