Merge lp:~fboucault/camera-app/fix_header_flickering_arale into lp:camera-app

[Florian Boucault]

Do not render camera when in photo roll and vice-versa.

Aside from performance improvement, this works around a bug specific to arale where the photo roll header is visible on top of the share popover.

=== modified file 'camera-app.qml'
--- camera-app.qml	2015-01-25 14:18:09 +0000
+++ camera-app.qml	2015-04-24 12:13:46 +0000
@@ -153,6 +153,7 @@
                 height: viewSwitcher.height
                 overlayVisible: !viewSwitcher.moving && !viewSwitcher.flicking
                 inView: !viewSwitcher.atXEnd
+                opacity: inView ? 1.0 : 0.0
                 onPhotoTaken: {
                     galleryView.prependMediaToModel(filePath);
                     galleryView.showLastPhotoTaken();
@@ -169,6 +170,7 @@
                 height: viewSwitcher.height
                 inView: !viewSwitcher.atXBeginning
                 onExit: viewSwitcher.switchToViewFinder()
+                opacity: inView ? 1.0 : 0.0
             }
         }
     }