setting rework

Change-Id: Ife7b20b0083ba31ad414a2e593d305318406a81e

Conflicts:
	src/com/android/camera/VideoModule.java
swapped icon for video controller

Change-Id: I533f380b3b79242065135a2f745c45388ecbf100