Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Camera2: Improve shutter button

-Fix shutter button location
-Use smaller drawables

Before - http://goo.gl/4iCocE
After  - http://goo.gl/i63k8C

Change-Id: Id51fba53372bc7f67750e82063bfa7e1479ea503
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat
Automatic translation import

Change-Id: I312ada4438928e311a1da18657e1444007d648e5
Camera2: Move CAF string

Change-Id: Ib9199a0afd07b5b759e544aa78d86df14691537d
Camera2: Prevent propogating CancelAutoFocus during Video Recording

When AutoFocus is started during Video Recording, CancelAutoFocus
is called after KEY_FOCUS_TIME seconds. CancelAutoFocus has the
side effect of resetting the sensor AF position and will result in
instant loss of focus which is not a desired event when AF is
manually triggered in case of Video Recording.

Change-Id: Icee7f6dfd4ad083c9b383ee2a4df6a34e4668de6
Camera: Add more exposure time entries

Change-Id: Ic0eff74c818acef28f9f9a4448c57ef4523e7826
Camera: Enable all slow shutter speeds

Change-Id: Ib04ac2e2e59684e7b3747ab68c2e7ffac8386f97
Camera: Move out TimeLapse option from global list

TimeLapse setting was common for front and back camera
As there is no specific reason to have it common, to align with
other settings, moved it out from common list so that Timelapse
setting change in front camrea will not affect for back camera
and vice versa.

CRs-Fixed: 654627
Change-Id: I0b14284adc6063ccb9bf175a37644c162bb47fd5
Merge "Camera2: Improve shutter button" into cm-11.0
Automatic translation import

Change-Id: I9ac34d194cefc4f2d3e41ed0bf7db66ee681905d
Add 9.7MP widescreen resolution

Change-Id: Icb7dec2986115d2676f716d7c95407acf586607b
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into kitkat

Conflicts:
	res/drawable-hdpi-v19/btn_shutter_default.png
	res/drawable-hdpi-v19/btn_shutter_pressed.png
	res/drawable-hdpi-v19/btn_shutter_recording.png
	res/drawable-hdpi/btn_shutter_default.png
	res/drawable-mdpi-v19/btn_shutter_default.png
	res/drawable-mdpi-v19/btn_shutter_pressed.png
	res/drawable-mdpi-v19/btn_shutter_recording.png
	res/drawable-mdpi/btn_shutter_default.png
	res/drawable-sw600dp-hdpi-v19/btn_shutter_default.png
	res/drawable-sw600dp-hdpi/btn_shutter_default.png
	res/drawable-sw600dp-mdpi-v19/btn_shutter_default.png
	res/drawable-sw600dp-mdpi/btn_shutter_default.png
	res/drawable-sw600dp-xhdpi-v19/btn_shutter_default.png
	res/drawable-sw600dp-xhdpi/btn_shutter_default.png
	res/drawable-sw600dp-xxhdpi-v19/btn_shutter_default.png
	res/drawable-sw600dp-xxhdpi/btn_shutter_default.png
	res/drawable-xhdpi-v19/btn_shutter_default.png
	res/drawable-xhdpi-v19/btn_shutter_pressed.png
	res/drawable-xhdpi-v19/btn_shutter_recording.png
	res/drawable-xhdpi/btn_shutter_default.png
	res/drawable-xxhdpi-v19/btn_shutter_default.png
	res/drawable-xxhdpi-v19/btn_shutter_pressed.png
	res/drawable-xxhdpi-v19/btn_shutter_recording.png

Change-Id: I5e09a16daf28fd09d259279c75be5f2d265c1bb8
Merge branch 'kitkat' of https://github.com/Nico60/packages_apps_Camera2 into kitkat