Add storage selection (1/2)

Patch Set 2 : Cleaned a few very minor things up.

Change-Id: I3a86a4698d07cede8f93f5fbd8f92b9464d82b90
Revert "Add storage selection (1/2)"

This reverts commit 7ede9fa9623302a89a334ae4b2d4f3440d4d38b8.
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Add storage selection (1/2)

Patch Set 2 : Cleaned a few very minor things up.

Patch Set 3 : Fixed indentation.

Patch Set 4 : Changed how 'sStorage' is accessed, it is now a private static member.

Patch Set 5/6 : Fixed indentation. (yet again...)

Change-Id: I3a86a4698d07cede8f93f5fbd8f92b9464d82b90
camera: add support for various focus modes

Change-Id: I4d06a57292edaa28cae68154f32184178b15f2e7
camera: add support for various scene modes

Change-Id: Ie2cd3066010713870c7ba465ad6b57daa2c2573e
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Camera: port additional settings from jellybean 4.1 (Round 2)

- add touch-to-focus timeout duration settings
- add volume button zoom controls to camera and camcorder
  (Panorama does not support zooming)

Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Camera: Allow setting "profile-video-size" before recording starts

In Samsung Galaxy TAB 10.1 (p4, p4wifi, p4tmo, p4vzw) in HD (720p)
recording dicoloration happens on top third off all video recordings
due to the preview size not set correctly. This fixes it that the
correct preview size is set so that no discoloration happens.

Change-Id: Ib51be18dff76df882984e644becb9430fe6cd5c8
Revert "Camera: port additional settings from jellybean 4.1 (Round 2)"

This reverts commit 9180d3256783a9c27b02caa2e515402a53c2473d.
Camera: port additional settings from jellybean 4.1 (Round 2)

- add touch-to-focus timeout duration settings
- add volume button zoom controls to camera and camcorder
  (Panorama does not support zooming)

Change-Id: Ib2c2c152a52b2616dd0da6f071f572d34fe64065
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Camera into cm-10.1