History log of /packages/apps/LegacyCamera/res/values/arrays.xml
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
14f75622cf4b651089594d155a9c6a0000c51b17 12-Jun-2012 Pin Ting <pinting@google.com> Remove UI entry for disco video recording effect.

Bug:6294985
Change-Id: I7d10f694001b91eb81d0c8042e2f97bb0737a83c
/packages/apps/LegacyCamera/res/values/arrays.xml
60dc073ff3087af41f9cf3b738eaa74bb2212f95 27-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5310099: Accept an array of default values for ListPreference.

The reason we want an array of default values is some of them may
be unsupported on a hardware platform. The first supported value
in the array will be used as the default value.

Change-Id: I9e372304ec0eaea3181cf70c352a50b82d4b8c58
/packages/apps/LegacyCamera/res/values/arrays.xml
5ac06dce20d61113fae6295036905db0bfaf1d7e 26-Oct-2011 Chih-Chung Chang <chihchung@google.com> Fix 5514199: Update assets.

Change-Id: I563c9c6e08260cdb0d8c4b5dd0e45c17edce20af
/packages/apps/LegacyCamera/res/values/arrays.xml
7d44299d515d3d9809ebc16c8150d5faadfbc6d8 03-Oct-2011 Chung-yih Wang <cywang@google.com> Add timelapse assets.

bug:5360827

Change-Id: I9df68f73747211774c949ee0dba8f1be11f4e450
/packages/apps/LegacyCamera/res/values/arrays.xml
05999715cc38365aa4751a2a355eb1af284573ab 23-Sep-2011 Angus Kong <shkong@google.com> Show the real resolution for quality settings.

1. Change the assets.
2. Change the strings from high/low/mms to 1080p/720p/480p.
3. Change the preference from customized string to the real values of
CamcorderProfile.QUALITY_[1080|720|480]P

bug:5141068
Change-Id: I294799bda8e873f828bbf4bd21330591f0859632
/packages/apps/LegacyCamera/res/values/arrays.xml
717ddf373190a7a0b85d57d2ffa4f4ed26abb5b1 21-Sep-2011 Angus Kong <shkong@google.com> Show the video quality setting only when needed.

1. Remove mms option from quality setting.
2. Hide the quality preference when the desired quality is already known.

bug:5141068
Change-Id: I3d839bc60fc6173626d0dfb4110edb06db4bf28e
/packages/apps/LegacyCamera/res/values/arrays.xml
5e73dd3bc86baa3cc32cb94ec8f20a818d8156c0 20-Sep-2011 Wu-cheng Li <wuchengli@google.com> Add icons for goofy faces and background replacement.

bug:5226051
Change-Id: I5758a5e8aaa0f12bc06b63b99d9c6ed2b42d507d
/packages/apps/LegacyCamera/res/values/arrays.xml
56a88304836ec9f5080d876e03bba61857d0666f 19-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Updates to background replacement videos.

- Switch to 480p quality
- Add in the final Disco video.

Change-Id: I5262db2569f2074b79dffaa4952339657ece7d39
/packages/apps/LegacyCamera/res/values/arrays.xml
15d9a599aa3d354a89c7dcac7f03aa458f3a4158 15-Sep-2011 Wu-cheng Li <wuchengli@google.com> Fix effect selection is not reset in setting popup.

bug:5280921
Change-Id: Iaf05eb162edf77036ec9e161b64d96696e32b4e9
/packages/apps/LegacyCamera/res/values/arrays.xml
bd242c048d4c26d516015c79900f47b776348730 09-Sep-2011 Eino-Ville Talvala <etalvala@google.com> Update background replacement videos and matching strings.

Use system default videos in list. Currently only low-quality.

Change-Id: I20675d46f9bf7a3c3ca92cdb2979d2b0828dca71
/packages/apps/LegacyCamera/res/values/arrays.xml
9efb0b19fa929c528253f0a9b6f5b27791e1ee52 20-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Add video recording with effects into Camera.

Initial support for video recording in the Camera app, with
the goofyface and background replacement effects.

Bug: 5212166

Change-Id: I30995e305c202ba57bf76ff18c885bf16c5ea14f
/packages/apps/LegacyCamera/res/values/arrays.xml
71e76dcebdbb3e5768fc948bed9c529a5787294e 28-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add goofy face effect setting UI.

The functionality is not working yet.

bug:5226051

Change-Id: Icb684d9320688f90ea0856b97424f9bfb6c47f39
/packages/apps/LegacyCamera/res/values/arrays.xml
46521167db54dcc88e5bf6dc82798fa912a5a66a 18-Aug-2011 Wu-cheng Li <wuchengli@google.com> Update white-balance and remove old setting icon.

bug:5024054
Change-Id: I6a11ba498c2eee82f5496594b61351fe745eb4a9
/packages/apps/LegacyCamera/res/values/arrays.xml
b56b2387b0f8d92a84e90639701fdaebab68dda2 18-Aug-2011 Wu-cheng Li <wuchengli@google.com> Update new flash assets.

bug:5024054
Change-Id: I29d3101ea25a659bf591a03a93ce1ad6abfc8b79
/packages/apps/LegacyCamera/res/values/arrays.xml
a18605333f037e5c8ff95584bc932e539ece249e 11-Aug-2011 Wu-cheng Li <wuchengli@google.com> Merge "Remove color effects to simplify UI."
d159d11f5a47928a59c9bf27fbae1a95dd6cbb02 10-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove color effects to simplify UI.

bug:5141303
Change-Id: Ie6a9d0dde40c1ed1d7ec6f93f8e6e6bbc9393bf7
/packages/apps/LegacyCamera/res/values/arrays.xml
51d798d7bd9999da336feff1fa401567e92f4dde 10-Aug-2011 Wu-cheng Li <wuchengli@google.com> Remove some scene modes.

To simplify UI, remove some scene modes. Keep only auto,
night, party, sport, and sunset.

bug:5141484

Change-Id: I1c9daa17e8e147a6be42abb6611523390da906ff
/packages/apps/LegacyCamera/res/values/arrays.xml
d835c675ae8c971df835f086467401853f2ec41f 01-Aug-2011 Mingyu Kim <mingyu0.kim@samsung.com> Add 1.3M picture size

Signed-off-by: Mingyu Kim <mingyu0.kim@samsung.com>

bug:5075098

Change-Id: I082a18084febb9a42b525b106c9d7b1c2a74574e
/packages/apps/LegacyCamera/res/values/arrays.xml
02af7e82f97ade581703c7f4a32666e4f578173b 20-Jun-2011 Wu-cheng Li <wuchengli@google.com> Remove jpeg quality.

Jpeg quality (super fine, fine, normal) is confusing for some users.
Just always use super fine. This also simplifies the UI.

bug:4993146
Change-Id: I55c2bf7d5aa8391f1656e3d5fdd0e7b2732459ed
/packages/apps/LegacyCamera/res/values/arrays.xml
b3681fed693233f202e250ff22fed70d1bbb1932 18-Jan-2011 Wu-cheng Li <wuchengli@google.com> Remove 0.25s and 0.5s from time lapse recording.

Software encoder needs more than 0.25s to encode a frame.
Besides, we will add arc shaped indicator and it looks
bad with 0.25s and 0.5s.

Change-Id: Ic54748d91d91ad7fcc4701ede6cf1e07af73ecfb
/packages/apps/LegacyCamera/res/values/arrays.xml
75da345f6899b6e10274b9a443b32848aa34f39c 23-Dec-2010 Chung-yih Wang <cywang@google.com> Increase the resolution of video quality low.

bug:3287017
Change-Id: I7b3d814eecad5555690e1afca6e038ca43e44aeb
/packages/apps/LegacyCamera/res/values/arrays.xml
ac058a1c9895c2a47e94fd7e8c0b43a51dfd0e2c 08-Dec-2010 Wu-cheng Li <wuchengli@google.com> Add time lapse recording code.

UI is not enabled because time lapse recording still has some problems.

bug:2901600
Change-Id: I1d60be9b11f8b98928dd5acacb79c70a3c2330e9
/packages/apps/LegacyCamera/res/values/arrays.xml
e747919853dfcbe29969647d7bf83269056d77bc 29-Nov-2010 Wu-cheng Li <wuchengli@google.com> Move scene mode to indicator wheel.

bug:3156671
Change-Id: I8e663f7bfde805eeef06bf4f3d9b883a58e51ce5
/packages/apps/LegacyCamera/res/values/arrays.xml
59ddc8c1add2fcffe523e3877baad1b6cc5ba2fb 22-Nov-2010 Chung-yih Wang <cywang@google.com> Add front/back camera switch

bug:3156676
Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
/packages/apps/LegacyCamera/res/values/arrays.xml
a9c35d6056be887b99a2d2faa52dd0f60b61311a 16-Nov-2010 Wu-cheng Li <wuchengli@google.com> Remove white-balance canned images.

UI was re-designed.
bug:3156667

Change-Id: I8284b136c3a5c3231cb4101d42372095ffca1219
/packages/apps/LegacyCamera/res/values/arrays.xml
5fda23dc5c015de8fcf9956c2fc9849a8c44b265 21-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add color effect UI to indicator wheel.

Change-Id: I9f6724e6b5410fa4758dc0f0d4d28c5dc377567a
/packages/apps/LegacyCamera/res/values/arrays.xml
f5bffc476b8293b30bb500bed2ab7914bb4ca411 12-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add more settings control in control panel.

Change-Id: I6280f5bfbcc87fde2ae046b65a9f91fa620c88bc
/packages/apps/LegacyCamera/res/values/arrays.xml
cc5e5721c611ad4cd91b1b650d9c615c6ee858a2 14-Oct-2010 Wu-cheng Li <wuchengli@google.com> am 8980fa66: am d6e48e7e: Merge "Add party and candlelight scene modes." into gingerbread

Merge commit '8980fa66ef1a23a9a49f92189ab467431c4b747c'

* commit '8980fa66ef1a23a9a49f92189ab467431c4b747c':
Add party and candlelight scene modes.
c3395f81322ab0e0697d0487292095a48848f3a1 12-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add party and candlelight scene modes.

bug:3088074
Change-Id: I65fdc5567e2845e82ade22d671c16dc5f77e3492
/packages/apps/LegacyCamera/res/values/arrays.xml
dfee7f813adb8de209472d24553b860d2515ea0a 11-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add white balance setting UI for xlarge layout.

Change-Id: I9775aae56cdee41232e628ebbaa87f7749d7e61f
/packages/apps/LegacyCamera/res/values/arrays.xml
2f619da3f49e2f42019a9e6ce3b2fafd6fdabde3 03-Oct-2010 Wu-cheng Li <wuchengli@google.com> am 32f510ed: Add 2560x1920 picture size.

Merge commit '32f510ed80edaf790d418cbf76c45213b0ba4e30'

* commit '32f510ed80edaf790d418cbf76c45213b0ba4e30':
Add 2560x1920 picture size.
32f510ed80edaf790d418cbf76c45213b0ba4e30 03-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add 2560x1920 picture size.

bug:3051830
Change-Id: Ifbceb2b168cf60ab34cd4cfb7ec4f087df4263b4
/packages/apps/LegacyCamera/res/values/arrays.xml
ccb9df3be2ded7ee4bbeb54181a787e9001c73ee 02-Oct-2010 Wu-cheng Li <wuchengli@google.com> am 2c7cb1af: Add QVGA picture size and change VGA to translatable=false.

Merge commit '2c7cb1af8f9f700bab1b263b004a1d4265400ea7'

* commit '2c7cb1af8f9f700bab1b263b004a1d4265400ea7':
Add QVGA picture size and change VGA to translatable=false.
2c7cb1af8f9f700bab1b263b004a1d4265400ea7 02-Oct-2010 Wu-cheng Li <wuchengli@google.com> Add QVGA picture size and change VGA to translatable=false.

bug:3051830
Change-Id: I53a58b1e289f3882bd073f2f8deb77a29a759456
/packages/apps/LegacyCamera/res/values/arrays.xml
f6a9ed7f6b08d0694795adc6ea6fce999e8cab87 15-Sep-2010 Nipun Kwatra <nkwatra@google.com> Adding ui for setting frame capture interval.

Currently adding a bunch of discrete options for the user
to choose from.

- Modified BasicIndicator class to allow ListPreference as well as
IconListPreference.
- Modified addIndicator() in HeadUpDisplay to take ListPreference
instead of IconListPreference.
- Modified GpsIndicator::getIcon() to return BitmapTexture instead
of ResourceTexture as its base class BasicIndicator does the same
now.
- Fixed default value of time lapse quality.

Change-Id: I9f01d8c77e9a803219c4661e10731fabbecf65a9
/packages/apps/LegacyCamera/res/values/arrays.xml
035376721081f70aaf41d3da31aa50b479624ef0 12-Sep-2010 Nipun Kwatra <nkwatra@google.com> Filter out unsupported time lapse resolutions.

- Filtering out unsupported resolutions.
- Added getSupportedTimeLapseProfiles() to find the list of supported
time lapse profiles.
- added CamcorderProfile quality level values to the
pref_video_time_lapse_quality_entryvalues in arrays.xml
- removed getVideoTimeLapseQuality as can use the quality values directly.
- Use the newly added time lapse profiles for setting resolution values.

Change-Id: I0776a38e0a9bd19fff772878869e1c0504aadc8d
/packages/apps/LegacyCamera/res/values/arrays.xml
430d55def5d87aa9f35d135eac319eb905912693 12-Sep-2010 Nipun Kwatra <nkwatra@google.com> Adding 480p resources.

Adding resources for the 480p resolution.

Change-Id: I455a541d950607123eed3dbe20f25d3054bc18cb
/packages/apps/LegacyCamera/res/values/arrays.xml
65c5919bc9d1aa584717cbd9a2641151a4e41426 02-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 3c7f489d: Merge "Remove quick capture UI. It is not used." into gingerbread

Merge commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58'

* commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58':
Remove quick capture UI. It is not used.
ed8d17a1716b0c8d7d4f4451ad15de66355e9dc0 01-Sep-2010 Wu-cheng Li <wuchengli@google.com> Remove quick capture UI. It is not used.

Change-Id: Ie087afba5633304c71ca5f72276d16f620931869
/packages/apps/LegacyCamera/res/values/arrays.xml
7a03ab3258d2c6baa397da09c8a98b0a23426d8c 30-Aug-2010 Wu-cheng Li <wuchengli@google.com> am 454c6838: Remove metering mode support.

Merge commit '454c6838bb220142d05fbd6f1858ba31cc034eda'

* commit '454c6838bb220142d05fbd6f1858ba31cc034eda':
Remove metering mode support.
454c6838bb220142d05fbd6f1858ba31cc034eda 30-Aug-2010 Wu-cheng Li <wuchengli@google.com> Remove metering mode support.

Change-Id: I624f611e19c438630bc84778332d13f0357da23f
/packages/apps/LegacyCamera/res/values/arrays.xml
6227fa641518492a6b660c78463da18d9ec8fcd8 06-Aug-2010 Nipun Kwatra <nkwatra@google.com> Added support for time lapse video capture.

Changes in individual files:

VideoCamera.java:
- Added swith to time lapse option in Menu.
- initializeHeadUpDisplay(): sets up display according to the
current mode (timelapse/no timelapse).
- readTimeLapseVideoPreferences(): sets parameters according to
the chosen quality. Eventually this should move to CamcorderProfile
through media_profiles.xml files.
- switchTimeLapseMode(): handles switching between time lapse mode
normal mode.
- Since preview size may be different from video size for HD time lapse
capture, we save the desired preview size in mDesiredPreviewWidth,
mDesiredPreviewHeight and use it for comparison in
resetCameraParameters().
- Time lapse mode is enabled/disabled by calling
mMediaRecorder.setTimeLapseParameters().

CamcorderHeadUpDisplay.java: Constructor now takes in a boolean
(captureTimeLapse) telling whether to enable time lapse quality
options or the normal camcorder quality options.

Camera.java: Moved getOptimalPreviewSize() to Util.java to enable
use from VideoCamera.java. Also needed to pass activity, so that can
use getWindowManager(), getSystemService().

CameraSettings.java: added support for time lapse parameters. The
function getVideoTimeLapseQuality() returns the quality identifier
from the passed in string.

res/: added string, array values for time lapse.

res/xml/video_time_lapse_preferences.xml: contains all the preferences
for time lapse mode.

Change-Id: I194e7bc0b6218aa742d91c859a122de2b953a314
/packages/apps/LegacyCamera/res/values/arrays.xml
186ff08e71d106e329171055accd4395760495ea 04-Jun-2010 Wu-cheng Li <wuchengli@google.com> Add metering mode support.

Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
/packages/apps/LegacyCamera/res/values/arrays.xml
82544b4564c079ece1a9065d19add36b2635bb8f 01-Apr-2010 Owen Lin <owenlin@google.com> Remove unused resources and code.

Change-Id: I394352f9da02d2585b2635e07c96bfa1c942d070
/packages/apps/LegacyCamera/res/values/arrays.xml
469a9ef839e38630e1e652d182f7e0ee5882e277 10-Mar-2010 Owen Lin <owenlin@google.com> New UI for camcorder.

Change-Id: Id35564836da7b4051662cccfd0920480421499b0
/packages/apps/LegacyCamera/res/values/arrays.xml
4de149ceb47f2c251f646419907424bfb67d2b64 29-Jan-2010 Owen Lin <owenlin@google.com> The first runnable version of the new UI.

Implement the new UI with OpenGL (GLSurfaceView).

Known issues:

* Texture are never freed from GL
* Do not consider the density of screen. Currently, the dimensions in mdpi
devices are wrong.
* It won't work on Sapphire, bug fired: Bug: 2473605
* The action UP event may pass a wrong target. (It should pass to the same
target who recive the DOWN action.
* Animation is not smooth enough.
* Should not allocate objects into heap during rendering path.
* The scrollbar in GLListView doesn't match the design
* We should calculate our own orientation instead of using the system one.
* Regression: "restore to default settings" is removed

Change-Id: I93fa45831aa87787dd5ee9e43e270a9d786c5a2a
/packages/apps/LegacyCamera/res/values/arrays.xml
8791695ba110ad0b088d2e8b3b0127c0042e1865 23-Jan-2010 Owen Lin <owenlin@google.com> Add quick capture settings for Camera application.

Change-Id: Ic4ca9f9e1802559c0d6604616555a94cdee1378b
Bug: 2259528
/packages/apps/LegacyCamera/res/values/arrays.xml
da3e9964a4a82a942d7f450e7c89904f5c5aa03f 07-Dec-2009 Wu-cheng Li <wuchengli@google.com> Add flash light setting in video camera.

http://b/2118298
/packages/apps/LegacyCamera/res/values/arrays.xml
4ddee78a1507b3c067745023bd2330b866b8aaf9 24-Nov-2009 Owen Lin <owenlin@google.com> Add one more picture size settings.

We need small size for the fake camera in emulator.

Change-Id: I5543936338813d575efc158c78e219da7feb9415
/packages/apps/LegacyCamera/res/values/arrays.xml
503560f0dc42d6185c61be06f8060dfd50d30d69 19-Nov-2009 Owen Lin <owenlin@google.com> Keep space for those empty icons but hide them if the feature is not
supported.

fix bug: http://b/2250438

Change-Id: I79eb9d575cf275c25decc6236b80f61ecfdf3042
/packages/apps/LegacyCamera/res/values/arrays.xml
3e44f8076a16792bb295589ca4b467ba27ea2a6f 17-Nov-2009 Owen Lin <owenlin@google.com> Use "Use My Location" settings to decide wheather we store the picture's location.

However, if user has specifically assign the "Record Location" we will
follow the settings.

Bug: http://b/2265010

Change-Id: I4863d299b8f461ee73c8aeb4651740855efe3dbd
/packages/apps/LegacyCamera/res/values/arrays.xml
9c90e4ffabcb51d340648d71ada7208bc4e2de96 12-Nov-2009 Cheng-Ru Lin <owenlin@google.com> Hide the indicator if the icon is empty.

Also change the order of on-screen icons.

http://b/issue?id=2250438

Change-Id: I25b0edfa1913aa3dacd960df87d5d7103e352bce
/packages/apps/LegacyCamera/res/values/arrays.xml
faf398ff0fa2b51348b4545505112d70ba7b47a1 09-Nov-2009 Chih-Chung Chang <chihchung@google.com> Fix 2241232: Read system properties for quality setting.

Change-Id: Ic823abd0c352b3eca0b8ef504307bd1de7d1700f
/packages/apps/LegacyCamera/res/values/arrays.xml
7f2726c0d42bb089b19ec1f04bf3137856404a3d 05-Nov-2009 Wu-cheng Li <wuchengli@google.com> Remove whiteboard and blackboard color effects.
/packages/apps/LegacyCamera/res/values/arrays.xml
6e4a7d90f4a6728e9db7173e221aa504d13828ec 02-Nov-2009 Wu-cheng Li <wuchengli@google.com> Change white-balance string "cloudy" to "cloudy-daylight".

b2230804
/packages/apps/LegacyCamera/res/values/arrays.xml
5a0f8a8db0a20ac8fec5e33d88e43d6c6259edae 06-Oct-2009 Chih-Chung Chang <chihchung@google.com> Fix 2166632: Change of wording in Camera ->Video ->Settings
/packages/apps/LegacyCamera/res/values/arrays.xml
40d9d41083ea636b7d3a0ee9db9f01d7d2dd6e7a 03-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Since string is freeze now. Change it to an existed one.

About Bug: 2156915

Change-Id: I610062f6ec7635ff49c6c6af260afe4fac776f34
/packages/apps/LegacyCamera/res/values/arrays.xml
0ba3c366e19447398930c81951417b6442b02149 01-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Add support for passions 5MP resolution.

Change-Id: I95463ae9df159d97c08dbdae1c6bf95eb769af3c
/packages/apps/LegacyCamera/res/values/arrays.xml
52de1515854859600afe355d9e1672c73016d594 01-Oct-2009 Cheng-Ru Lin <owenlin@google.com> Fix some stupid bugs.

Change-Id: I64280ec21677d84ac3ad6f29168bf9d3234d2194
/packages/apps/LegacyCamera/res/values/arrays.xml
f404a034455cef3b214236449eab859c4e8999b8 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Add icons in on screen menu for whitebalance and focus mode.

Change-Id: Ic10c68404a703279918c3a86473d364030affa8a
/packages/apps/LegacyCamera/res/values/arrays.xml
2f3774c974a5a044a3b32ca68182a3f2180d0124 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Revert "Revert "Add icon support for options in preference setting screen.""

This reverts commit 7af25641ec401d9f669497bd401020f2cb5933ef.

Change-Id: I03381ffeee4aca787ea376bcd5fe150ff0f97dbf
/packages/apps/LegacyCamera/res/values/arrays.xml
25156f0e1bb921d3d8f7f5cc51e141522533b502 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Add indicator for focus, white balance, and scene mode.

Change-Id: Iead8a7a28aeaa07210fd56ecac1f6f6a74fee155
/packages/apps/LegacyCamera/res/values/arrays.xml
27e69927ba1a69aaa7a72eab16a278221c2db273 30-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Try some mock icons to feel the layout.

Change-Id: I697e45f93e0c6592bdd812f84d5db189f8cf6b4d
/packages/apps/LegacyCamera/res/values/arrays.xml
7af25641ec401d9f669497bd401020f2cb5933ef 29-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Revert "Add icon support for options in preference setting screen."

This reverts commit 723f84eadb3c1a79337ef20e4d0a014341537adb.

Conflicts:

res/values/arrays.xml
res/xml/camera_preferences.xml
src/com/android/camera/IconListPreference.java

Change-Id: Ic5fd32735656cfaed56cf256a0b9530d051f2240
/packages/apps/LegacyCamera/res/values/arrays.xml
a8bbcd7ce25aada705561852ea9f356dc38c0f43 25-Sep-2009 Cheng-Ru Lin <owenlin@google.com> Change the checkbox style to list style for record location preference.

Change-Id: Ie209887169623f090df0ee7a85f2709b4a54e202
/packages/apps/LegacyCamera/res/values/arrays.xml
32bfffa5822490ea0e105e9fe00b9df8db1b7b02 19-Sep-2009 Owen Lin <owenlin@google.com> Change the default settings of picture size to the largest one.

This fix issue: http://b/2140738.

Change-Id: I9d92370897df7fe392801baa068913728c7d2ffc
/packages/apps/LegacyCamera/res/values/arrays.xml
723f84eadb3c1a79337ef20e4d0a014341537adb 19-Sep-2009 Owen Lin <owenlin@google.com> Add icon support for options in preference setting screen.

Change-Id: I4029ef11d49922139b8aab423e9871c803ab4a82
/packages/apps/LegacyCamera/res/values/arrays.xml
37acf79b1cc060f355c9cd1803c2bdd5e39deb27 17-Sep-2009 Owen Lin <owenlin@google.com> Add a icon bar to show the current state.

Change-Id: Ic0c32abffed267fa97b6b449c4dd432af3e0e591
/packages/apps/LegacyCamera/res/values/arrays.xml
cc529326d9369290abd6933f1d070859b3cadf75 18-Sep-2009 Wu-cheng Li <wuchengli@google.com> Set focus mode to camera driver and add macro focus.
/packages/apps/LegacyCamera/res/values/arrays.xml
6d12b828743cbd81767227229d6351ce412d5698 17-Sep-2009 Owen Lin <owenlin@google.com> Simplify the code. Change references of "@strings" to literals for those
non-translatable values.

Change-Id: I56636cd8f5674937ee6e3fb4023959199fcf4bb0
/packages/apps/LegacyCamera/res/values/arrays.xml
a4e3d2723156de4d03ef1e9807ca4125b166e22e 17-Sep-2009 Owen Lin <owenlin@google.com> Move flash settings from on-scren control to preference settings.

Change-Id: Id45c7321c1e60cc7e29a7e9c601082624d93c9e8
/packages/apps/LegacyCamera/res/values/arrays.xml
72d69c3c42721c1ff5142763e987a2557892f9eb 09-Sep-2009 Wu-cheng Li <wuchengli@google.com> Mark non-translatable strings to translatable="false".

b2054300
/packages/apps/LegacyCamera/res/values/arrays.xml
8d0ba007ec6ef9bb34dc0c9f40c4c29dad2691e0 08-Sep-2009 Owen Lin <owenlin@google.com> Add scene mode preference in camera.

Change-Id: I56fe3a1fc942f18faefbbc06d0fdac013c791ed6
/packages/apps/LegacyCamera/res/values/arrays.xml
5f6484a74fe019337e436e6e0dcb07375a74af25 02-Apr-2009 President Li <wuchengli@google.com> Cherry pick two commits that implements color effect and white-balance
settings and then make it workable.

Change-Id: I519bff761db4b2b0acc1a61a8f901fafcd4b2586
/packages/apps/LegacyCamera/res/values/arrays.xml
86d6fa40f4c01c7e623379cd84f4caea76186512 01-Sep-2009 Eric Fischer <enf@google.com> Mark the untranslatable Camera arrays as translatable="false".

The magic comment is "do not translate", not "do not localize",
so these were still getting sent over for translations.
/packages/apps/LegacyCamera/res/values/arrays.xml
3665f924034a13014c9016be2707617d29d57f39 02-Sep-2009 Owen Lin <owenlin@google.com> Remove trailing spaces.

Change-Id: I80feb1b58c148b35b2666ef08d4b13d5aa0608b2
/packages/apps/LegacyCamera/res/values/arrays.xml
6f2c530d91749ff2b235125c3d134c981970f13d 31-Aug-2009 Chih-Chung Chang <chihchung@google.com> Make the video duration preference text depend on the system property.

Also upgrade old "1 minutes" duration to new "MMS video length" duration.

Change-Id: I21a975f2a3f1cde1c35a336e5552a2ae350bb6f6
/packages/apps/LegacyCamera/res/values/arrays.xml
8df283a6685ee0dd18cd3276b6bb716b21f269c6 21-Aug-2009 Chih-Chung Chang <chihchung@google.com> Add on-screen flash button.
/packages/apps/LegacyCamera/res/values/arrays.xml
5945773c664ada754ce5eb9239bd4c8bd95ee4b4 03-Aug-2009 Wu-cheng Li <wuchengli@google.com> Add flash mode setting.
/packages/apps/LegacyCamera/res/values/arrays.xml
45ac637670f79ece83eb794415c0c32095f3cda7 22-Jul-2009 Chih-Chung Chang <chihchung@google.com> Enable 5MP resolution 2592x1936.
/packages/apps/LegacyCamera/res/values/arrays.xml
b5e5722981c02926fdbeae7880e662cbbacfe173 18-Jun-2009 Wu-cheng Li <wuchengli@google.com> Remove white balance, effects, ISO, and brightness from setting.
/packages/apps/LegacyCamera/res/values/arrays.xml
8c84596e3bde14db9361f1903039d885e62eace9 21-May-2009 Chih-Chung Chang <chihchung@google.com> Add 30 minutes option for video recording duration.
/packages/apps/LegacyCamera/res/values/arrays.xml
82ded2070a47fff16e1de1c78b516eb25888b91e 20-May-2009 Chih-Chung Chang <chihchung@google.com> Implement 1746508: add duration limit settings to camcorder.
/packages/apps/LegacyCamera/res/values/arrays.xml
48b71ca522b5915b1163d91cd41875878692ab18 26-Apr-2009 Wu-cheng Li <wuchengli@google.com> Add ISO setting.
modified: res/values/arrays.xml
modified: res/values/strings.xml
modified: res/xml/camera_preferences.xml
modified: src/com/android/camera/Camera.java
modified: src/com/android/camera/CameraSettings.java
/packages/apps/LegacyCamera/res/values/arrays.xml
c396ca0bd5129bc6ae754ea7366e410c5bac41b0 15-Apr-2009 Ray Chen <raychen@google.com> Add brightness control to Camera application.
/packages/apps/LegacyCamera/res/values/arrays.xml
0f56ef5704b7f1a0874528367147487c051876d9 15-Apr-2009 Wu-cheng Li <wuchengli@google.com> Add infinity focus mode.
/packages/apps/LegacyCamera/res/values/arrays.xml
e0770004600f76cc4b440104e98e14712b4fd1c6 13-Apr-2009 Wu-cheng Li <> AI 145839: Add UI for JPEG quality setting.
BUG=1761244

Automated import of CL 145839
/packages/apps/LegacyCamera/res/values/arrays.xml
9dacf7b214339440c16f3d66e12d6afef1248f68 10-Apr-2009 Wu-cheng Li <> AI 145679: Add picture size settings.
BUG=1761248

Automated import of CL 145679
/packages/apps/LegacyCamera/res/values/arrays.xml
2ac0387bbd6792187aeaacf10e40688f4260e316 02-Apr-2009 Wu-cheng Li <> AI 144213: Initial implementation of effect settings.
BUG=1753515

Automated import of CL 144213
/packages/apps/LegacyCamera/res/values/arrays.xml
87341536812081826656040ac81f8f386c6c1407 02-Apr-2009 Wu-cheng Li <> AI 144187: Initial implementation of manual white-balance setting.
BUG=1742461

Automated import of CL 144187
/packages/apps/LegacyCamera/res/values/arrays.xml
b64d345c9d51cabce43b5191532a0c185d2a70a5 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/LegacyCamera/res/values/arrays.xml
becfb351a5bc43050128f44eb1bcfbcc0c6dcb7a 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/LegacyCamera/res/values/arrays.xml
0eaec58e292ce4eaa6baadecf643f0f65e48d278 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/packages/apps/LegacyCamera/res/values/arrays.xml