Camera2: Tweak some strings

Taken from CameraNext resources

Change-Id: I5d3cd7f7ca0f08be39ba571826db3bae8019b333
Camera2: Fix default slow shutter option

Broken after http://review.cyanogenmod.org/63070

Change-Id: I611c1bd812ab1151fd91f3c758c0e3c357e3454f
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into cm-11.0
Camera2: Use consistent translations for megapixels

Change-Id: If12826cd6a4c11f4b5ccdcd2d7a8166914276da8
make settings menu themable

Move colors to resources and use them instead.

Change-Id: If43440bf7bf6dbed360621a0313f8624fe663552
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into cm-11.0
camera2: fix pref_camera_picturesize_entryvalues values order

The value for 1024x768 is out of order in the
pref_camera_picturesize_entryvalues array.

On the Kindle Fire HD, this causes Camera2 to select a picture size
of 1024x768 instead of the max supported resolution of 1280x720.

Change-Id: If15a3d6d20679f691e61d80288e9e47c8f8f5937
Merge "camera2: fix pref_camera_picturesize_entryvalues values order" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Camera2 into cm-11.0

Conflicts:
	src/com/android/camera/ui/PieRenderer.java