Also, add labels to video menu

  Bug: 8618169

Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c

diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index d0671eb..a5d9fc8 100644 (file)
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -37,6 +37,7 @@
             camera:icons="@array/video_flashmode_icons"
             camera:largeIcons="@array/video_flashmode_largeicons"
             camera:entries="@array/pref_camera_video_flashmode_entries"
+            camera:labels="@array/pref_camera_video_flashmode_labels"
             camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_whitebalance_key"
@@ -45,6 +46,7 @@
             camera:icons="@array/whitebalance_icons"
             camera:largeIcons="@array/whitebalance_largeicons"
             camera:entries="@array/pref_camera_whitebalance_entries"
+            camera:labels="@array/pref_camera_whitebalance_labels"
             camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_id_key"
@@ -52,6 +54,7 @@
             camera:title="@string/pref_camera_id_title"
             camera:icons="@array/camera_id_icons"
             camera:entries="@array/camera_id_entries"
+            camera:labels="@array/camera_id_labels"
             camera:largeIcons="@array/camera_id_largeicons"/>
     <IconListPreference
             camera:key="pref_video_effect_key"

diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index ea70ddc..431483f 100644 (file)
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -72,8 +72,11 @@ public class VideoMenu extends PieController
         }
         // camera switcher
         if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
+            ListPreference lpref = group.findPreference(CameraSettings.KEY_CAMERA_ID);
             item = makeItem(R.drawable.ic_switch_video_facing_holo_light);
             item.setPosition(POS_SWITCH, 5);
+            item.setLabel(lpref.getLabel());
+            final PieItem fitem = item;
             item.setOnClickListener(new OnClickListener() {
 
                 @Override
@@ -87,6 +90,7 @@ public class VideoMenu extends PieController
                         index = (index + 1) % values.length;
                         int newCameraId = Integer.parseInt((String) values[index]);
                         mListener.onCameraPickerClicked(newCameraId);
+                        fitem.setLabel(pref.getLabel());
                     }
                 }
             });
@@ -101,6 +105,7 @@ public class VideoMenu extends PieController
         };
         item = makeItem(R.drawable.ic_settings_holo_light);
         item.setPosition(POS_SET, 5);
+        item.setLabel(mActivity.getResources().getString(R.string.camera_menu_settings_label));
         item.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(PieItem item) {