resolved conflicts for merge of 503560f0 to eclair-mr2

Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823

4 files changed, 19 insertions, 15 deletions

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index e6b3b47..199208f 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -49,6 +49,8 @@
                     android:layout_marginLeft="10dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
+                <!-- Thsee icons should be in the same order as the
+                        on-screen menu items -->
                 <com.android.camera.IconIndicator
                         style="@style/IconIndicator"
                         android:id="@+id/gps_icon"
@@ -56,24 +58,24 @@
                         camera:icons="@array/gps_icons"/>
                 <com.android.camera.IconIndicator
                         style="@style/IconIndicator"
+                        android:id="@+id/flash_icon"
+                        camera:modes="@array/flash_modes"
+                        camera:icons="@array/flash_icons"/>
+                <com.android.camera.IconIndicator
+                        style="@style/IconIndicator"
                         android:id="@+id/scenemode_icon"
                         camera:modes="@array/scenemode_modes"
                         camera:icons="@array/scenemode_icons"/>
                 <com.android.camera.IconIndicator
                         style="@style/IconIndicator"
-                        android:id="@+id/focus_icon"
-                        camera:modes="@array/pref_camera_focusmode_entryvalues"
-                        camera:icons="@array/focusmode_icons"/>
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
                         android:id="@+id/whitebalance_icon"
                         camera:modes="@array/pref_camera_whitebalance_entryvalues"
                         camera:icons="@array/whitebalance_icons"/>
                 <com.android.camera.IconIndicator
                         style="@style/IconIndicator"
-                        android:id="@+id/flash_icon"
-                        camera:modes="@array/flash_modes"
-                        camera:icons="@array/flash_icons"/>
+                        android:id="@+id/focus_icon"
+                        camera:modes="@array/pref_camera_focusmode_entryvalues"
+                        camera:icons="@array/focusmode_icons"/>
             </LinearLayout>
         </FrameLayout>
     </com.android.camera.PreviewFrameLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a457055..fd613ba 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -100,7 +100,7 @@
     </array>
 
     <array name="focusmode_icons">
-        <item>@null</item>
+        <item>@drawable/ic_viewfinder_empty</item>
         <item>@drawable/ic_viewfinder_focus_infinity</item>
         <item>@drawable/ic_viewfinder_focus_macro</item>
     </array>
@@ -138,14 +138,14 @@
         <item>auto</item>
         <item>on</item>
         <item>off</item>
-        <item>no_flash</item>
+        <item>@string/pref_camera_flashmode_no_flash</item>
     </string-array>
 
     <array name="flash_icons">
         <item>@drawable/ic_viewfinder_flash_auto</item>
         <item>@drawable/ic_viewfinder_flash_on</item>
         <item>@drawable/ic_viewfinder_flash_off</item>
-        <item>@null</item>
+        <item>@drawable/ic_viewfinder_empty</item>
     </array>
 
     <string-array name="gps_modes" translatable="false">
@@ -154,7 +154,7 @@
     </string-array>
 
     <array name="gps_icons">
-        <item>@null</item>
+        <item>@drawable/ic_viewfinder_empty</item>
         <item>@drawable/ic_camera_sym_gps</item>
     </array>
 
@@ -184,7 +184,7 @@
     </array>
 
     <array name="whitebalance_icons">
-        <item>@null</item>
+        <item>@drawable/ic_viewfinder_empty</item>
         <item>@drawable/ic_viewfinder_wb_incandescent</item>
         <item>@drawable/ic_viewfinder_wb_daylight</item>
         <item>@drawable/ic_viewfinder_wb_fluorescent</item>
@@ -259,7 +259,7 @@
     </string-array>
 
     <array name="scenemode_icons">
-        <item>@null</item>
+        <item>@drawable/ic_viewfinder_empty</item>
         <item>@drawable/ic_viewfinder_scenemode</item>
     </array>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 02310f8..010fda2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -214,6 +214,9 @@
     <!-- Default flash mode setting.-->
     <string name="pref_camera_flashmode_default" translatable="false">auto</string>
 
+    <!-- Value for flash off setting-->
+    <string name="pref_camera_flashmode_no_flash" translatable="false">no_flash</string>
+
     <!-- Settings screen, Flash mode title -->
     <string name="pref_camera_flashmode_title">Flash mode</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 04bd634..2e09e45 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -62,7 +62,6 @@
         <item name="android:windowExitAnimation">@null</item>
     </style>
     <style name="IconIndicator">
-        <item name="android:visibility">gone</item>
         <item name="android:layout_marginTop">10dp</item>
         <item name="android:layout_marginBottom">10dp</item>
         <item name="android:layout_width">wrap_content</item>