summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2011-08-31 14:05:55 +0800
committerChung-yih Wang <cywang@google.com>2011-09-01 00:09:29 +0800
commitb1ce29490ec61847602ece16f3745417787d3d8f (patch)
treed9f41fc9a1f4722a8f3c7f8e5d712ab4275d88ac /res
parentc2f9a6866c8c0ea970f50645c33cf6296721bd91 (diff)
downloadpackages_apps_LegacyCamera-b1ce29490ec61847602ece16f3745417787d3d8f.zip
packages_apps_LegacyCamera-b1ce29490ec61847602ece16f3745417787d3d8f.tar.gz
packages_apps_LegacyCamera-b1ce29490ec61847602ece16f3745417787d3d8f.tar.bz2
Add the missing setEnabled() for phone UI controls.
bug:5109283 We have to hide the setting buttons during video recording, or it will crash the camera driver easily by changing the camera settings. For camera mode, we just simply disable the buttons with grey out effect. Change-Id: Iec06a48f246ab5ef9ae4d8c6ca0b78851fcb0155
Diffstat (limited to 'res')
-rw-r--r--res/layout/indicator_bar.xml2
-rw-r--r--res/xml/camera_preferences.xml112
-rw-r--r--res/xml/video_preferences.xml94
3 files changed, 102 insertions, 106 deletions
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index 359b4ad..0d5cb78 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -45,7 +45,7 @@
android:layout_centerHorizontal="true"
android:layout_width="48dp"
android:layout_height="match_parent">
- <ImageView
+ <com.android.camera.ui.ColorFilterImageView
android:id="@+id/zoom_control_icon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c7a1d90..aa1882f 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -15,61 +15,59 @@
-->
<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
- <PreferenceGroup
- camera:title="@string/pref_camera_settings_category">
- <IconListPreference
- camera:key="pref_camera_flashmode_key"
- camera:defaultValue="@string/pref_camera_flashmode_default"
- camera:title="@string/pref_camera_flashmode_title"
- camera:icons="@array/camera_flashmode_icons"
- camera:largeIcons="@array/camera_flashmode_largeicons"
- camera:entries="@array/pref_camera_flashmode_entries"
- camera:entryValues="@array/pref_camera_flashmode_entryvalues" />
- <ListPreference
- camera:key="pref_camera_exposure_key"
- camera:defaultValue="@string/pref_exposure_default"
- camera:title="@string/pref_exposure_title" />
- <IconListPreference
- camera:key="pref_camera_scenemode_key"
- camera:defaultValue="@string/pref_camera_scenemode_default"
- camera:title="@string/pref_camera_scenemode_title"
- camera:singleIcon="@drawable/ic_viewfinder_scene_mode"
- camera:entries="@array/pref_camera_scenemode_entries"
- camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
- <IconListPreference
- camera:key="pref_camera_whitebalance_key"
- camera:defaultValue="@string/pref_camera_whitebalance_default"
- camera:title="@string/pref_camera_whitebalance_title"
- camera:icons="@array/whitebalance_icons"
- camera:largeIcons="@array/whitebalance_largeicons"
- camera:entries="@array/pref_camera_whitebalance_entries"
- camera:entryValues="@array/pref_camera_whitebalance_entryvalues" />
- <RecordLocationPreference
- camera:key="pref_camera_recordlocation_key"
- camera:defaultValue="@string/pref_camera_recordlocation_default"
- camera:title="@string/pref_camera_recordlocation_title"
- camera:icons="@array/camera_recordlocation_icons"
- camera:largeIcons="@array/camera_recordlocation_largeicons"
- camera:entries="@array/pref_camera_recordlocation_entries"
- camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
- <ListPreference
- camera:key="pref_camera_picturesize_key"
- camera:title="@string/pref_camera_picturesize_title"
- camera:entries="@array/pref_camera_picturesize_entries"
- camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
- <ListPreference
- camera:key="pref_camera_focusmode_key"
- camera:defaultValue="@string/pref_camera_focusmode_default"
- camera:title="@string/pref_camera_focusmode_title"
- camera:entries="@array/pref_camera_focusmode_entries"
- camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
- <IconListPreference
- camera:key="pref_camera_id_key"
- camera:defaultValue="@string/pref_camera_id_default"
- camera:title="@string/pref_camera_id_title"
- camera:icons="@array/camera_id_icons"
- camera:entries="@array/camera_id_entries"
- camera:largeIcons="@array/camera_id_largeicons" />
- </PreferenceGroup>
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+ camera:title="@string/pref_camera_settings_category">
+ <IconListPreference
+ camera:key="pref_camera_flashmode_key"
+ camera:defaultValue="@string/pref_camera_flashmode_default"
+ camera:title="@string/pref_camera_flashmode_title"
+ camera:icons="@array/camera_flashmode_icons"
+ camera:largeIcons="@array/camera_flashmode_largeicons"
+ camera:entries="@array/pref_camera_flashmode_entries"
+ camera:entryValues="@array/pref_camera_flashmode_entryvalues" />
+ <ListPreference
+ camera:key="pref_camera_exposure_key"
+ camera:defaultValue="@string/pref_exposure_default"
+ camera:title="@string/pref_exposure_title" />
+ <IconListPreference
+ camera:key="pref_camera_scenemode_key"
+ camera:defaultValue="@string/pref_camera_scenemode_default"
+ camera:title="@string/pref_camera_scenemode_title"
+ camera:singleIcon="@drawable/ic_viewfinder_scene_mode"
+ camera:entries="@array/pref_camera_scenemode_entries"
+ camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
+ <IconListPreference
+ camera:key="pref_camera_whitebalance_key"
+ camera:defaultValue="@string/pref_camera_whitebalance_default"
+ camera:title="@string/pref_camera_whitebalance_title"
+ camera:icons="@array/whitebalance_icons"
+ camera:largeIcons="@array/whitebalance_largeicons"
+ camera:entries="@array/pref_camera_whitebalance_entries"
+ camera:entryValues="@array/pref_camera_whitebalance_entryvalues" />
+ <RecordLocationPreference
+ camera:key="pref_camera_recordlocation_key"
+ camera:defaultValue="@string/pref_camera_recordlocation_default"
+ camera:title="@string/pref_camera_recordlocation_title"
+ camera:icons="@array/camera_recordlocation_icons"
+ camera:largeIcons="@array/camera_recordlocation_largeicons"
+ camera:entries="@array/pref_camera_recordlocation_entries"
+ camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
+ <ListPreference
+ camera:key="pref_camera_picturesize_key"
+ camera:title="@string/pref_camera_picturesize_title"
+ camera:entries="@array/pref_camera_picturesize_entries"
+ camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
+ <ListPreference
+ camera:key="pref_camera_focusmode_key"
+ camera:defaultValue="@string/pref_camera_focusmode_default"
+ camera:title="@string/pref_camera_focusmode_title"
+ camera:entries="@array/pref_camera_focusmode_entries"
+ camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
+ <IconListPreference
+ camera:key="pref_camera_id_key"
+ camera:defaultValue="@string/pref_camera_id_default"
+ camera:title="@string/pref_camera_id_title"
+ camera:icons="@array/camera_id_icons"
+ camera:entries="@array/camera_id_entries"
+ camera:largeIcons="@array/camera_id_largeicons" />
</PreferenceGroup>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 031e416..847b581 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -15,52 +15,50 @@
-->
<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
- <PreferenceGroup
- camera:title="@string/pref_camcorder_settings_category">
- <IconListPreference
- camera:key="pref_video_quality_key"
- camera:defaultValue="@string/pref_video_quality_default"
- camera:title="@string/pref_video_quality_title"
- camera:largeIcons="@array/video_quality_largeicons"
- camera:entries="@array/pref_video_quality_entries"
- camera:entryValues="@array/pref_video_quality_entryvalues"/>
- <IconListPreference
- camera:key="pref_video_time_lapse_frame_interval_key"
- camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default"
- camera:title="@string/pref_video_time_lapse_frame_interval_title"
- camera:singleIcon="@drawable/ic_time_lapse_holo_dark"
- camera:entries="@array/pref_video_time_lapse_frame_interval_entries"
- camera:entryValues="@array/pref_video_time_lapse_frame_interval_entryvalues"/>
- <IconListPreference
- camera:key="pref_camera_video_flashmode_key"
- camera:defaultValue="@string/pref_camera_video_flashmode_default"
- camera:title="@string/pref_camera_flashmode_title"
- camera:icons="@array/video_flashmode_icons"
- camera:largeIcons="@array/video_flashmode_largeicons"
- camera:entries="@array/pref_camera_video_flashmode_entries"
- camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
- <IconListPreference
- camera:key="pref_camera_whitebalance_key"
- camera:defaultValue="@string/pref_camera_whitebalance_default"
- camera:title="@string/pref_camera_whitebalance_title"
- camera:icons="@array/whitebalance_icons"
- camera:largeIcons="@array/whitebalance_largeicons"
- camera:entries="@array/pref_camera_whitebalance_entries"
- camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
- <IconListPreference
- camera:key="pref_camera_id_key"
- camera:defaultValue="@string/pref_camera_id_default"
- camera:title="@string/pref_camera_id_title"
- camera:icons="@array/camera_id_icons"
- camera:entries="@array/camera_id_entries"
- camera:largeIcons="@array/camera_id_largeicons"/>
- <IconListPreference
- camera:key="pref_video_effect_key"
- camera:defaultValue="@string/pref_video_effect_default"
- camera:title="@string/pref_video_effect_title"
- camera:singleIcon="@drawable/ic_effects_holo_light"
- camera:entries="@array/pref_video_effect_entries"
- camera:entryValues="@array/pref_video_effect_entryvalues" />
- </PreferenceGroup>
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+ camera:title="@string/pref_camcorder_settings_category">
+ <IconListPreference
+ camera:key="pref_video_quality_key"
+ camera:defaultValue="@string/pref_video_quality_default"
+ camera:title="@string/pref_video_quality_title"
+ camera:largeIcons="@array/video_quality_largeicons"
+ camera:entries="@array/pref_video_quality_entries"
+ camera:entryValues="@array/pref_video_quality_entryvalues"/>
+ <IconListPreference
+ camera:key="pref_video_time_lapse_frame_interval_key"
+ camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default"
+ camera:title="@string/pref_video_time_lapse_frame_interval_title"
+ camera:singleIcon="@drawable/ic_time_lapse_holo_dark"
+ camera:entries="@array/pref_video_time_lapse_frame_interval_entries"
+ camera:entryValues="@array/pref_video_time_lapse_frame_interval_entryvalues"/>
+ <IconListPreference
+ camera:key="pref_camera_video_flashmode_key"
+ camera:defaultValue="@string/pref_camera_video_flashmode_default"
+ camera:title="@string/pref_camera_flashmode_title"
+ camera:icons="@array/video_flashmode_icons"
+ camera:largeIcons="@array/video_flashmode_largeicons"
+ camera:entries="@array/pref_camera_video_flashmode_entries"
+ camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
+ <IconListPreference
+ camera:key="pref_camera_whitebalance_key"
+ camera:defaultValue="@string/pref_camera_whitebalance_default"
+ camera:title="@string/pref_camera_whitebalance_title"
+ camera:icons="@array/whitebalance_icons"
+ camera:largeIcons="@array/whitebalance_largeicons"
+ camera:entries="@array/pref_camera_whitebalance_entries"
+ camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
+ <IconListPreference
+ camera:key="pref_camera_id_key"
+ camera:defaultValue="@string/pref_camera_id_default"
+ camera:title="@string/pref_camera_id_title"
+ camera:icons="@array/camera_id_icons"
+ camera:entries="@array/camera_id_entries"
+ camera:largeIcons="@array/camera_id_largeicons"/>
+ <IconListPreference
+ camera:key="pref_video_effect_key"
+ camera:defaultValue="@string/pref_video_effect_default"
+ camera:title="@string/pref_video_effect_title"
+ camera:singleIcon="@drawable/ic_effects_holo_light"
+ camera:entries="@array/pref_video_effect_entries"
+ camera:entryValues="@array/pref_video_effect_entryvalues" />
</PreferenceGroup>