commit d706ea69a87229dca5cb8f16125decfbcbc5303d
author Erin Dahlgren <edahlgren@google.com> Tue Jan 21 16:16:06 2014 -0800
committer Erin Dahlgren <edahlgren@google.com> Tue Jan 21 16:31:15 2014 -0800
tree 26fe7dbaacb9bc8e542fe91a397887a88bf7b88e
parent a1fab413bcbe5f62ae1d829bac0539519fef96a6

Fix the build: use exported panorama values in helper class.

Change-Id: I5b22fe0504fa113f3867d7e626087c9880bbccdd

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b57698e..4bca5e3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -562,11 +562,6 @@
       <item>@string/pano_orientation_vertical</item>
     </string-array>
 
-    <array name="panorama_indicator_icons" translatable="false">
-      <item>@drawable/ic_pano_horizontal</item>
-      <item>@drawable/ic_pano_vertical</item>
-    </array>
-
     <array name="settings_toggle_icons" translatable="false">
       <item>@drawable/ic_options</item>
       <item>@drawable/ic_options_active</item>

src/com/android/camera/app/CameraAppUI.java

diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java
index 2628514..6f183f7 100644
--- a/src/com/android/camera/app/CameraAppUI.java
+++ b/src/com/android/camera/app/CameraAppUI.java
@@ -49,6 +49,7 @@
 import com.android.camera.ui.PreviewStatusListener;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
+import com.android.camera.util.PhotoSphereHelper;
 import com.android.camera.widget.FilmstripLayout;
 import com.android.camera.widget.IndicatorIconController;
 import com.android.camera.widget.IndicatorOverlay;
@@ -1177,14 +1178,18 @@
             }
         }
 
-        if (bottomBarSpec.enablePanoHorizontal) {
+        if (bottomBarSpec.enablePanoHorizontal
+                && PhotoSphereHelper.getPanoramaHorizontalDrawableId() > 0) {
             buttonManager.enablePushButton(ButtonManager.BUTTON_PANO_HORIZONTAL,
-                bottomBarSpec.panoHorizontalCallback, R.drawable.ic_pano_horizontal);
+                bottomBarSpec.panoHorizontalCallback,
+                PhotoSphereHelper.getPanoramaHorizontalDrawableId());
         }
 
-        if (bottomBarSpec.enablePanoVertical) {
+        if (bottomBarSpec.enablePanoVertical
+                && PhotoSphereHelper.getPanoramaVerticalDrawableId() > 0) {
             buttonManager.enablePushButton(ButtonManager.BUTTON_PANO_VERTICAL,
-                bottomBarSpec.panoVerticalCallback, R.drawable.ic_pano_vertical);
+                bottomBarSpec.panoVerticalCallback,
+                PhotoSphereHelper.getPanoramaVerticalDrawableId());
         }
 
         /** Intent UI */

src/com/android/camera/widget/IndicatorIconController.java

diff --git a/src/com/android/camera/widget/IndicatorIconController.java b/src/com/android/camera/widget/IndicatorIconController.java
index 071cbe9..a684bac 100644
--- a/src/com/android/camera/widget/IndicatorIconController.java
+++ b/src/com/android/camera/widget/IndicatorIconController.java
@@ -29,6 +29,7 @@
 import com.android.camera.app.AppController;
 import com.android.camera.module.ModulesInfo;
 import com.android.camera.settings.SettingsManager;
+import com.android.camera.util.PhotoSphereHelper;
 
 import com.android.camera2.R;
 
@@ -75,8 +76,10 @@
             R.array.pref_camera_hdr_plus_indicator_icons);
         mRefocusIndicatorIcons = context.getResources().obtainTypedArray(
             R.array.refocus_indicator_icons);
-        mPanoramaIndicatorIcons = context.getResources().obtainTypedArray(
-            R.array.panorama_indicator_icons);
+        if (PhotoSphereHelper.getPanoramaIndicatorArrayId() > 0) {
+            mPanoramaIndicatorIcons = context.getResources().obtainTypedArray(
+                PhotoSphereHelper.getPanoramaIndicatorArrayId());
+        }
     }
 
     @Override
@@ -207,7 +210,7 @@
             && buttonManager.isEnabled(ButtonManager.BUTTON_PANO_VERTICAL));
         boolean panoVisible = (buttonManager.isVisible(ButtonManager.BUTTON_PANO_HORIZONTAL)
             && buttonManager.isVisible(ButtonManager.BUTTON_PANO_VERTICAL));
-        if (panoEnabled && panoVisible) {
+        if (panoEnabled && panoVisible && mPanoramaIndicatorIcons != null) {
             setIndicatorState(mController.getSettingsManager(),
                               SettingsManager.SETTING_CAMERA_PANO_ORIENTATION,
                               mPanoramaIndicator, mPanoramaIndicatorIcons, true);

src_pd/com/android/camera/util/PhotoSphereHelper.java

diff --git a/src_pd/com/android/camera/util/PhotoSphereHelper.java b/src_pd/com/android/camera/util/PhotoSphereHelper.java
index 3b22576..1e04eca 100644
--- a/src_pd/com/android/camera/util/PhotoSphereHelper.java
+++ b/src_pd/com/android/camera/util/PhotoSphereHelper.java
@@ -101,4 +101,25 @@
     public static long getModifiedTimeFromURI(ContentResolver contentResolver, Uri contentUri) {
         return 0;
     }
+
+    /**
+     * Get the resource id of the panorama horizontal icon.
+     */
+    public static int getPanoramaHorizontalDrawableId() {
+        return 0;
+    }
+
+    /**
+     * Get the resource id of the panorama vertical icon.
+     */
+    public static int getPanoramaVerticalDrawableId() {
+        return 0;
+    }
+
+    /**
+     * Get the resource id of the panorama indicator icon array.
+     */
+    public static int getPanoramaIndicatorArrayId() {
+        return 0;
+    }
 }