From 048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Sun, 6 Oct 2013 17:49:51 -0700
Subject: [PATCH] Initialize GCam with GServices values.

  Bug: 11103065

Change-Id: Ic8d3c9825abdc5d79c5e4c7b0e96770ab0941036
---
 src/com/android/camera/CameraActivity.java          |  2 ++
 src/com/android/camera/CameraSettings.java          |  2 +-
 src/com/android/camera/ui/ModuleSwitcher.java       | 18 ++++++++----------
 src_pd_gcam/com/android/camera/util/GcamHelper.java |  4 +++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 56789deda..282c2fe21 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -881,6 +881,8 @@ public class CameraActivity extends Activity
     @Override
     public void onCreate(Bundle state) {
         super.onCreate(state);
+        GcamHelper.init(getContentResolver());
+
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
         setContentView(R.layout.camera_filmstrip);
         mActionBar = getActionBar();
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index bd016f0a3..55867a1e8 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -227,7 +227,7 @@ public class CameraSettings {
         int frontCameraId = CameraHolder.instance().getFrontCameraId();
         boolean isFrontCamera = (frontCameraId == mCameraId);
         if (cameraHdrPlus != null && (!ApiHelper.HAS_CAMERA_HDR_PLUS ||
-                !GcamHelper.hasGcamAsHDRMode() || isFrontCamera)) {
+                !GcamHelper.hasGcamCapture() || isFrontCamera)) {
             removePreference(group, cameraHdrPlus.getKey());
         }
     }
diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java
index 9493d98b7..df76bbde2 100644
--- a/src/com/android/camera/ui/ModuleSwitcher.java
+++ b/src/com/android/camera/ui/ModuleSwitcher.java
@@ -108,9 +108,8 @@ public class ModuleSwitcher extends RotateImageView
             --numDrawIds;
         }
 
-        if (!GcamHelper.hasGcamCapture() || GcamHelper.hasGcamAsHDRMode()) {
-            --numDrawIds;
-        }
+        // Always decrement one because of GCam.
+        --numDrawIds;
 
         int[] drawids = new int[numDrawIds];
         int[] moduleids = new int[numDrawIds];
@@ -119,9 +118,8 @@ public class ModuleSwitcher extends RotateImageView
             if (i == LIGHTCYCLE_MODULE_INDEX && !PhotoSphereHelper.hasLightCycleCapture(context)) {
                 continue; // not enabled, so don't add to UI
             }
-            if (i == GCAM_MODULE_INDEX
-                    && (!GcamHelper.hasGcamCapture() || GcamHelper.hasGcamAsHDRMode())) {
-                continue; // not enabled, so don't add to UI
+            if (i == GCAM_MODULE_INDEX) {
+                continue; // don't add to UI
             }
             moduleids[ix] = i;
             drawids[ix++] = DRAW_IDS[i];
@@ -136,11 +134,11 @@ public class ModuleSwitcher extends RotateImageView
 
     public void setCurrentIndex(int i) {
         mCurrentIndex = i;
-        if (i == GCAM_MODULE_INDEX && GcamHelper.hasGcamAsHDRMode()) {
-            setImageResource(R.drawable.ic_switch_camera);
-            return;
+        if (i == GCAM_MODULE_INDEX) {
+          setImageResource(R.drawable.ic_switch_camera);
+        } else {
+          setImageResource(mDrawIds[i]);
         }
-        setImageResource(mDrawIds[i]);
     }
 
     public void setSwitchListener(ModuleSwitchListener l) {
diff --git a/src_pd_gcam/com/android/camera/util/GcamHelper.java b/src_pd_gcam/com/android/camera/util/GcamHelper.java
index 343d7aff2..9570f35f9 100644
--- a/src_pd_gcam/com/android/camera/util/GcamHelper.java
+++ b/src_pd_gcam/com/android/camera/util/GcamHelper.java
@@ -15,7 +15,7 @@
  */
 package com.android.camera.util;
 
-import android.content.Context;
+import android.content.ContentResolver;
 
 import com.android.camera.CameraModule;
 
@@ -33,4 +33,6 @@ public class GcamHelper {
         return false;
     }
 
+    public static void init(ContentResolver contentResolver) {
+    }
 }
-- 
2.11.0