Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera...

diff --cc src/com/android/camera/CameraActivity.java
Simple merge

diff --cc src/com/android/camera/settings/CameraSettingsActivity.java
index ca31913,7e654cc..94e8a32
--- 1/src/com/android/camera/settings/CameraSettingsActivity.java
--- 2/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@@ -104,13 -98,11 +104,15 @@@ public class CameraSettingsActivity ext
              super.onCreate(savedInstanceState);
              Context context = this.getActivity().getApplicationContext();
              addPreferencesFromResource(R.xml.camera_preferences);
 -            CameraSettingsActivityHelper.addAdditionalPreferences(this, context);
 +            // Only add the additional preferences when in the main settings
 +            // view, and not in the sub-preferences screens.
 +            if (mPrefKey == null) {
 +                CameraSettingsActivityHelper.addAdditionalPreferences(this, context);
 +            }
              mCamcorderProfileNames = getResources().getStringArray(R.array.camcorder_profile_names);
-             mInfos = CameraAgentFactory.getAndroidCameraAgent(context).getCameraDeviceInfo();
+             mInfos = CameraAgentFactory
+                     .getAndroidCameraAgent(context, CameraAgentFactory.CameraApi.API_1)
+                     .getCameraDeviceInfo();
          }
  
          @Override