summaryrefslogtreecommitdiffstats
path: root/res/xml
Commit message (Collapse)AuthorAgeFilesLines
* Fix 5310099: Accept an array of default values for ListPreference.Chih-Chung Chang2011-10-281-1/+1
| | | | | | | | 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
* Fix 5514199: Update assets.Chih-Chung Chang2011-10-271-1/+1
| | | | Change-Id: I563c9c6e08260cdb0d8c4b5dd0e45c17edce20af
* Rearrange the second level indicator set.Chung-yih Wang2011-10-051-0/+8
| | | | | | | | | bug:5360827 +change the icon spacing to 16dp +Store the geodata in the video. Change-Id: I133871066b6b9a8918f861f0510e3996d5b0f839
* Merge "Add timelapse assets."Chung-yih Wang2011-10-031-1/+1
|\
| * Add timelapse assets.Chung-yih Wang2011-10-031-1/+1
| | | | | | | | | | | | bug:5360827 Change-Id: I9df68f73747211774c949ee0dba8f1be11f4e450
* | Add Exposure assets.Chung-yih Wang2011-10-031-2/+3
|/ | | | | bug:5360827 Change-Id: I0cc0c32235f4f20181c2369e1fc2a8725547bdf0
* Add icons for goofy faces and background replacement.Wu-cheng Li2011-09-201-1/+2
| | | | | bug:5226051 Change-Id: I5758a5e8aaa0f12bc06b63b99d9c6ed2b42d507d
* Add the missing setEnabled() for phone UI controls.Chung-yih Wang2011-09-012-105/+101
| | | | | | | | | | 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
* Add goofy face effect setting UI.Wu-cheng Li2011-08-281-0/+7
| | | | | | | | The functionality is not working yet. bug:5226051 Change-Id: Icb684d9320688f90ea0856b97424f9bfb6c47f39
* Remove color effects to simplify UI.Wu-cheng Li2011-08-101-8/+0
| | | | | bug:5141303 Change-Id: Ie6a9d0dde40c1ed1d7ec6f93f8e6e6bbc9393bf7
* Remove color effect in camcorder app.Wu-cheng Li2011-07-071-9/+1
| | | | | | bug:5000060 Change-Id: Iaac250dfb0cabf3d6d6a9c563d432d9fac889a3d
* Remove jpeg quality.Wu-cheng Li2011-07-061-6/+0
| | | | | | | | 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
* Add time lapse recording icon.Wu-cheng Li2010-12-131-1/+1
| | | | | bug:3278548 Change-Id: I4ccf04d87f697b49975b2cebc48e6fe87166d772
* Add time lapse recording code.Wu-cheng Li2010-12-101-7/+1
| | | | | | | UI is not enabled because time lapse recording still has some problems. bug:2901600 Change-Id: I1d60be9b11f8b98928dd5acacb79c70a3c2330e9
* Add scene mode icon.Wu-cheng Li2010-12-011-1/+1
| | | | | bug:3156671 Change-Id: I3ffb7d632608d29bac7cdbe8858b1b70319aabc3
* Move scene mode to indicator wheel.Wu-cheng Li2010-11-292-3/+4
| | | | | bug:3156671 Change-Id: I8e663f7bfde805eeef06bf4f3d9b883a58e51ce5
* Remove front/back camera switch from indicator wheel.Wu-cheng Li2010-11-261-0/+1
| | | | | bug:3156676 Change-Id: Idb1052563356e54a27b2a5628c3db252d5f1ac54
* Add front/back camera switchChung-yih Wang2010-11-251-0/+1
| | | | | bug:3156676 Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
* Remove white-balance canned images.Wu-cheng Li2010-11-162-2/+0
| | | | | | | UI was re-designed. bug:3156667 Change-Id: I8284b136c3a5c3231cb4101d42372095ffca1219
* Add color effect UI to indicator wheel.Wu-cheng Li2010-10-212-18/+22
| | | | Change-Id: I9f6724e6b5410fa4758dc0f0d4d28c5dc377567a
* Add more settings control in control panel.Wu-cheng Li2010-10-142-2/+7
| | | | Change-Id: I6280f5bfbcc87fde2ae046b65a9f91fa620c88bc
* Add white balance setting UI for xlarge layout.Wu-cheng Li2010-10-111-0/+1
| | | | Change-Id: I9775aae56cdee41232e628ebbaa87f7749d7e61f
* Adding ui for setting frame capture interval.Nipun Kwatra2010-09-151-0/+6
| | | | | | | | | | | | | | | | 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
* Add switch camera on-screen button.Wu-cheng Li2010-09-082-0/+8
| | | | Change-Id: I1564fdf0f7f70f15278bdbdee6d9b5c8a6e683e0
* am 3c7f489d: Merge "Remove quick capture UI. It is not used." into gingerbreadWu-cheng Li2010-09-021-6/+0
|\ | | | | | | | | | | | | Merge commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58' * commit '3c7f489d9ea86e6f37b596469173cd3ceca3ad58': Remove quick capture UI. It is not used.
| * Remove quick capture UI. It is not used.Wu-cheng Li2010-09-011-6/+0
| | | | | | | | Change-Id: Ie087afba5633304c71ca5f72276d16f620931869
* | am 454c6838: Remove metering mode support.Wu-cheng Li2010-08-301-6/+0
|\ \ | |/ | | | | | | | | | | Merge commit '454c6838bb220142d05fbd6f1858ba31cc034eda' * commit '454c6838bb220142d05fbd6f1858ba31cc034eda': Remove metering mode support.
| * Remove metering mode support.Wu-cheng Li2010-08-301-6/+0
| | | | | | | | Change-Id: I624f611e19c438630bc84778332d13f0357da23f
* | Added support for time lapse video capture.Nipun Kwatra2010-08-101-0/+7
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add metering mode support.Wu-cheng Li2010-06-111-0/+6
| | | | Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
* New UI for camcorder.Owen Lin2010-03-141-13/+10
| | | | Change-Id: Id35564836da7b4051662cccfd0920480421499b0
* Camera should have the com.android.camera package name.Romain Guy2010-03-102-2/+2
| | | | | | Related to bug #2464545 Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240
* Add the new ZoomController UI and also the exposure compensation settings.Owen Lin2010-03-101-0/+4
| | | | | | | | | Fix the bug that some MotionEvent of some actions should always pass to the component who accept the DOWN event. Also fix a bug that nine patch image will be drawn incorrectly after rotation. Change-Id: I8ab36fb6f958c1967afa11eed5f167842b59cada
* Unbundle: change camera package name.Chih-Chung Chang2010-03-082-2/+2
| | | | Change-Id: I9b101ea486f06be553104bc4879f5ec66ae014bc
* Revert "Unbundle: change package name to com.google.android.camera"Chih-Chung Chang2010-03-082-2/+2
| | | | This reverts commit 1ace47c7352d65b10361863316b5748b4f3e0689.
* Unbundle: change package name to com.google.android.cameraChih-Chung Chang2010-03-052-2/+2
|
* The first runnable version of the new UI.Owen Lin2010-02-261-2/+5
| | | | | | | | | | | | | | | | | | | | 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
* Add quick capture settings for Camera application.Owen Lin2010-01-251-0/+6
| | | | | Change-Id: Ic4ca9f9e1802559c0d6604616555a94cdee1378b Bug: 2259528
* Unbundle with the PreferenceManager.Owen Lin2010-01-252-93/+82
| | | | Change-Id: Ib415bf36147f35cbf1681cd87514124822ac48c6
* Add flash light setting in video camera.Wu-cheng Li2009-12-081-0/+8
| | | | http://b/2118298
* am 3e44f807: Use "Use My Location" settings to decide wheather we store the ↵Owen Lin2009-11-181-1/+1
|\ | | | | | | | | | | | | | | | | picture\'s location. Merge commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f' into eclair-mr2 * commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f': Use "Use My Location" settings to decide wheather we store the picture's location.
| * Use "Use My Location" settings to decide wheather we store the picture's ↵Owen Lin2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | location. However, if user has specifically assign the "Record Location" we will follow the settings. Bug: http://b/2265010 Change-Id: I4863d299b8f461ee73c8aeb4651740855efe3dbd
* | am cc12a303: Add icon-indicators to VideoCamera.Cheng-Ru Lin2009-11-111-2/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'cc12a303ad51063cee73715849a951fb5f383188' into eclair-mr2 * commit 'cc12a303ad51063cee73715849a951fb5f383188': Add icon-indicators to VideoCamera.
| * Add icon-indicators to VideoCamera.Cheng-Ru Lin2009-11-121-2/+4
| | | | | | | | | | | | Change-Id: Ie5ace8cf1863636ffe94f89d70525483a95b3239 http://b/2247081
* | remove unused resource files and elementsOwen Lin2009-10-292-114/+0
|/ | | | Change-Id: Ia4e7b9724501c0a1c5c16008390e0116bb409c14
* Add icons in on screen menu for whitebalance and focus mode.Cheng-Ru Lin2009-10-011-2/+4
| | | | Change-Id: Ic10c68404a703279918c3a86473d364030affa8a
* Revert "Revert "Add icon support for options in preference setting screen.""Cheng-Ru Lin2009-10-011-2/+4
| | | | | | This reverts commit 7af25641ec401d9f669497bd401020f2cb5933ef. Change-Id: I03381ffeee4aca787ea376bcd5fe150ff0f97dbf
* Revert "Add icon support for options in preference setting screen."Cheng-Ru Lin2009-09-301-4/+2
| | | | | | | | | | | | This reverts commit 723f84eadb3c1a79337ef20e4d0a014341537adb. Conflicts: res/values/arrays.xml res/xml/camera_preferences.xml src/com/android/camera/IconListPreference.java Change-Id: Ic5fd32735656cfaed56cf256a0b9530d051f2240
* Fix style issues in on-screen settings.Cheng-Ru Lin2009-09-281-6/+6
| | | | | | | | | 1. Make the item as high as 64dp. 2. Move the title of the second level menu to the left 3. Change 5M to 5M pixel 4. Enlarge the viewfinder and also review image Change-Id: Iad0e05df168336ac6c80124d9b24e0e1acbfdf3e
* Change the checkbox style to list style for record location preference.Cheng-Ru Lin2009-09-261-3/+4
| | | | Change-Id: Ie209887169623f090df0ee7a85f2709b4a54e202