diff options
author | Santhosh Kumar H E <skhara@codeaurora.org> | 2013-12-05 16:36:52 +0530 |
---|---|---|
committer | Santhosh Kumar H E <skhara@codeaurora.org> | 2013-12-06 18:58:24 +0530 |
commit | dbdb7620da136374eea95170261032f910015db0 (patch) | |
tree | 007242cdb44941ecb855751c85da69aa97cc6a43 /res/values | |
parent | 1c7734057201ffd1b6d165d9e24793ef3d213043 (diff) | |
parent | df2b0819907c440a660e228414a18184732816d1 (diff) | |
download | android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.gz android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.bz2 android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.zip |
Merge remote-tracking branch into merge_branch
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Import translations. DO NOT MERGE
gcam: Clean up placeholders, and add deletion robustness.
Fix issue of focus indicator staying on without being hidden
Ensure view size gets updated after phone decors change.
Show the 100% state of the progress at least one frame.
Add parameters and deduplicate parameter changes
Revert parallel opening camera in photo mode.
Differentiate the InProgressData from the normal PhotoData.
Close mode menus if another control is touched
Start gcam module directly when handling capture intent.
Import translations. DO NOT MERGE
Add a null check to fix NPE
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
...
Conflicts:
res/layout/photo_module.xml
res/values/arrays.xml
src/com/android/camera/CameraActivity.java
src/com/android/camera/PhotoUI.java
src/com/android/camera/Storage.java
src/com/android/camera/WideAnglePanoramaModule.java
src/com/android/camera/ui/FilmStripView.java
Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/arrays.xml | 14 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 13 |
3 files changed, 21 insertions, 8 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 621f1c996..c77cdb314 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -181,12 +181,15 @@ <item>@string/pref_camera_picturesize_entry_1920x1080</item> <item>@string/pref_camera_picturesize_entry_2mp</item> <item>@string/pref_camera_picturesize_entry_2mp_wide</item> + <item>@string/pref_camera_picturesize_entry_1_5mp</item> <item>@string/pref_camera_picturesize_entry_1_3mp</item> <item>@string/pref_camera_picturesize_entry_1280x768</item> <item>@string/pref_camera_picturesize_entry_1280x720</item> <item>@string/pref_camera_picturesize_entry_1mp</item> <item>@string/pref_camera_picturesize_entry_800x600</item> <item>@string/pref_camera_picturesize_entry_800x480</item> + <item>960 x 720</item> + <item>720 x 480</item> <item>@string/pref_camera_picturesize_entry_vga</item> <item>@string/pref_camera_picturesize_entry_352x288</item> <item>@string/pref_camera_picturesize_entry_qvga</item> @@ -208,12 +211,15 @@ <item>1920x1080</item> <item>1600x1200</item> <item>1920x1088</item> + <item>1440x1080</item> <item>1280x960</item> <item>1280x768</item> <item>1280x720</item> <item>1024x768</item> <item>800x600</item> <item>800x480</item> + <item>960x720</item> + <item>720x480</item> <item>640x480</item> <item>352x288</item> <item>320x240</item> @@ -500,8 +506,8 @@ </string-array> <string-array name="pref_camera_hdr_plus_labels" translatable="false"> - <item>@string/pref_camera_scenemode_entry_hdr_plus</item> - <item>@string/pref_camera_scenemode_entry_hdr_plus</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_plus_on</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_plus_off</item> </string-array> <string-array name="pref_camera_hdr_plus_icons" translatable="false"> @@ -521,8 +527,8 @@ </string-array> <string-array name="pref_camera_hdr_labels" translatable="false"> - <item>@string/pref_camera_hdr_label</item> - <item>@string/pref_camera_hdr_label</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_on</item> + <item>@string/pref_camera_scenemode_entry_turn_hdr_off</item> </string-array> <string-array name="pref_camera_hdr_icons" translatable="false"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 692a87fbf..e2d4246df 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -74,6 +74,8 @@ <dimen name="effect_setting_type_text_left_padding_xlarge">26dp</dimen> <dimen name="onscreen_indicators_height_xlarge">36dp</dimen> <dimen name="onscreen_exposure_indicator_text_size_xlarge">18dp</dimen> + <dimen name="pie_progress_radius">25dp</dimen> + <dimen name="pie_progress_width">3dp</dimen> <dimen name="pie_radius_start">80dp</dimen> <dimen name="pie_radius_increment">48dp</dimen> <dimen name="pie_touch_slop">12dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 04b765879..5d2b09bcc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -185,6 +185,9 @@ <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] --> <string name="time_lapse_title">Time lapse recording</string> + <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] --> + <string name="capturing">Capturing</string> + <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] --> <string name="pref_camera_id_title">Choose camera</string> @@ -267,6 +270,8 @@ <string name="pref_camera_picturesize_entry_2mp">2M pixels</string> <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string> + <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=20] --> + <string name="pref_camera_picturesize_entry_1_5mp">1.5M pixels</string> <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string> <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=20] --> @@ -353,13 +358,13 @@ <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] --> <string name="pref_camera_scenemode_entry_hdr">HDR</string> <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] --> - <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">Turn HDR+ On</string> + <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string> <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] --> - <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">Turn HDR+ Off</string> + <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string> <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] --> - <string name="pref_camera_scenemode_entry_turn_hdr_on">Turn HDR On</string> + <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string> <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] --> - <string name="pref_camera_scenemode_entry_turn_hdr_off">Turn HDR Off</string> + <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string> <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] --> <string name="pref_camera_scenemode_entry_action">Action</string> <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] --> |