Gallery2 DE translation

* Add missing resolutions
* Reorder resolutions

Change-Id: I61f1e027e83d2c51bb6fc799e9fa1c73436caaa9
camera: Re-add workaround for freeze when recording stops

 * Device-specific issue. Readd until driver is fixed.

Change-Id: Ic57a6ebeb40370c0e4cb25eef37dfc0eec8717a2
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2
Revert "camera: Enable face detection parameter if required"

This reverts commit 321e62c4b58f35b2ba56ab7fceb4c57cb31dce5f.

Change-Id: Ib78f851f11490592324b3af003120bc66f754b55
camera: fix image capture review mode when zsl is enabled

Choosing "Take Photo" to change a contact image doesn't show
the captured imaged after taking a snap if ZSL is enabled.
Also observed on apps that use the native camera to capture
an image like Whatsapp.

In ZSL mode, the preview is not stopped, due to which the
review mode (ImageCapture) doesn't show the captured frame.
Hence stop the preview if ZSL mode is active so that the
preview can be restarted using the onReviewRetakeClicked().

Also, reset the autofocus and set the camera to idle only
when the ZSL mode is active. This fixes issues with non ZSL
cameras where autofocus works even during the review mode
after taking the snap since the camera state is set to idle.

Change-Id: I2aa3f4146575329c6fefb259b09937108084fdab
Merge "Gallery2 DE translation" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into dark-jelly-cm-10.2