CameraSettings: fix the filtering of unsupported settings

Color effects were not filtered for the video camera, and
the focus mode filtering logic for the camera was broken.

Change-Id: I85a68ec992b7c6efaed4dddbf836cf00b20a8f89

Conflicts:

	src/com/android/camera/CameraSettings.java