summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Create drawable-xlarge-mdpi directory for Camera.Hung-ying Tyan2010-12-025-23/+2
| | | | | | | Move large icons from drawable-mdpi to the new directory. Remove/revise some xml files accordingly. Change-Id: Ia138ba1deffcfa7cf0aa0646906ec562f160c48d
* am 314ba18d: (-s ours) am b3babe73: Merge "Fix NPE in releaseMediaRecorder. ↵Wu-cheng Li2010-12-010-0/+0
|\ | | | | | | | | | | | | do not merge" into gingerbread * commit '314ba18d434bcea2181158bc4b6d2cc223c6a734': Fix NPE in releaseMediaRecorder. do not merge
| * am b3babe73: Merge "Fix NPE in releaseMediaRecorder. do not merge" into ↵Wu-cheng Li2010-12-011-2/+3
| |\ | | | | | | | | | | | | | | | | | | gingerbread * commit 'b3babe73ce51b3842617d1690624b4d821bb30bb': Fix NPE in releaseMediaRecorder. do not merge
| | * Merge "Fix NPE in releaseMediaRecorder. do not merge" into gingerbreadWu-cheng Li2010-12-011-2/+3
| | |\
| | | * Fix NPE in releaseMediaRecorder. do not mergeWu-cheng Li2010-12-011-2/+3
| | | | | | | | | | | | | | | | Change-Id: I3b96bbaf3889ebf0ce825a20337196df04f11d19
* | | | am 8af8b215: (-s ours) am 2cb2c80e: Fix the bug that video thumbnail is not ↵Wu-cheng Li2010-12-010-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | mirrored in attach mode. do not merge * commit '8af8b215516fdf01a04b2f4a74c879fd8daf0e78': Fix the bug that video thumbnail is not mirrored in attach mode. do not merge
| * | | am 2cb2c80e: Fix the bug that video thumbnail is not mirrored in attach ↵Wu-cheng Li2010-12-011-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | mode. do not merge * commit '2cb2c80efaecd1a2b772f9b139618c8191b24cd4': Fix the bug that video thumbnail is not mirrored in attach mode. do not merge
| | * | Fix the bug that video thumbnail is not mirrored in attach mode. do not mergeWu-cheng Li2010-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | bug:3208306 Change-Id: Ib0c0a873a797a8a0e03f30897d087d0ddcb1c315
* | | | am fc7060a7: (-s ours) am c6bd89d1: Import revised translations. DO NOT MERGEEric Fischer2010-12-010-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fc7060a7ad470181d7248b93a111914e9e81a1dd': Import revised translations. DO NOT MERGE
| * | | am c6bd89d1: Import revised translations. DO NOT MERGEEric Fischer2010-11-3018-18/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'c6bd89d104c6fe31a6216c206dabc69cc3cb3848': Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2010-11-2918-18/+18
| | |/ | | | | | | | | | Change-Id: I271479c413d6db17af03838ae334837a5c0f1f2b
* | | Highlight icon when a camera setting is selected.Hung-ying Tyan2010-12-013-8/+22
| | | | | | | | | | | | | | | Bug: 3156690 Change-Id: I8c81345fb155d5137c349ed8b76225cfc43bb6b8
* | | Merge "Add scene mode icon."Wu-cheng Li2010-12-013-1/+1
|\ \ \
| * | | Add scene mode icon.Wu-cheng Li2010-12-013-1/+1
| | | | | | | | | | | | | | | | | | | | bug:3156671 Change-Id: I3ffb7d632608d29bac7cdbe8858b1b70319aabc3
* | | | Merge "Disable IndicatorWheel when ControlPanel is disabled."Hung-ying Tyan2010-12-012-4/+6
|\ \ \ \
| * | | | Disable IndicatorWheel when ControlPanel is disabled.Hung-ying Tyan2010-12-012-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed "mEnabled" in ControlPanel as "enabled" is already a property in the parent class (i.e., View). Bug: 3242889 Change-Id: Ia035ed3eb068331f3d1b8184a51f2c1742710c12
* | | | | Merge "Remove double tap to zoom."Wu-cheng Li2010-11-301-44/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove double tap to zoom.Wu-cheng Li2010-12-011-44/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Double tap to zoom is not very discoverable. Now zoom control is more obvious. It should be fine to remove double tap to zoom. bug:3229583 Change-Id: If0cfb75bd15b4721165a8943482b836fd4fb3125
* | | | Fix camera/video switch position during video recording.Hung-ying Tyan2010-12-012-16/+20
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RadioGroup's OnCheckedChangeListener instead of RadioButton's to avoid changing switch state during the transition of a RadioGroup checked state change as a RadioGroup checked state change consists of a series of checked state changes of its RadioButtons. Bug: 3242656 Change-Id: I42ebd3aaffab690888b78be6d4d40afa26746db3
* | | Add highlight arc above the selected setting.Hung-ying Tyan2010-11-302-12/+33
| | | | | | | | | | | | | | | | | | Bug: 3156690 Change-Id: I7ec745605d5fe9749b91c228bfd8ab1c70a5d423
* | | Override other camera settings when scene mode is active.Wu-cheng Li2010-11-308-16/+115
| | | | | | | | | | | | | | | | | | Flash mode, focus mode, white-balance cannot be changed when scene mode is not auto. bug:3156671 Change-Id: Iac019735e570903a1b9197ae6856cc612c7e67cb
* | | Merge "Move scene mode to indicator wheel."Wu-cheng Li2010-11-299-34/+39
|\ \ \
| * | | Move scene mode to indicator wheel.Wu-cheng Li2010-11-299-34/+39
| | | | | | | | | | | | | | | | | | | | bug:3156671 Change-Id: I8e663f7bfde805eeef06bf4f3d9b883a58e51ce5
* | | | Move the recording time indicator to preview frame.Chung-yih Wang2010-11-304-14/+14
| | | | | | | | | | | | | | | | Change-Id: I7df59eb25d5f1d251d35ca4d8cdf0ee52e1c2482
* | | | Merge "Revised comments in camera_control.xml"Hung-ying Tyan2010-11-291-3/+3
|\ \ \ \
| * | | | Revised comments in camera_control.xmlHung-ying Tyan2010-11-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about not able to set layout_width as wrap_content. Change-Id: Idf374d51331878e81f5a5489c2f46bbdb3df9409
* | | | | Fix misplacement of camera shutter button.Hung-ying Tyan2010-11-301-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | mCenterX should be calculated before laying out the shutter button. Change-Id: I23412f03314adefbbef95fba6d1035d37d1102f5
* | | | Import revised translations.Eric Fischer2010-11-298-8/+8
| | | | | | | | | | | | | | | | Change-Id: I8032b11dc25ded65e5384cad7135874649c82ec3
* | | | Merge "Removed unused assets."Gilles Debunne2010-11-292-0/+0
|\ \ \ \
| * | | | Removed unused assets.Gilles Debunne2010-11-162-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf3ce9ce21c8352180e9fd7056c1a5060b531b06
* | | | | Make camcorder recording time appear again.Hung-ying Tyan2010-11-292-4/+8
| |/ / / |/| | | | | | | | | | | | | | | | | | | Last CL introduces a bug making it disappear. Change-Id: I3ed4f1777d73f130aad3c4c7a20fedf160a2c86b
* | | | Merge "Increase camera preview frame size and other changes."Hung-ying Tyan2010-11-2822-59/+98
|\ \ \ \
| * | | | Increase camera preview frame size and other changes.Hung-ying Tyan2010-11-2622-59/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Increase camera preview frame size and align it to the left of the screen. + Move thumbnail to the lower left corner of the preview frame. + Move GPS indicator to the lower right corner of the preview frame. + Replace LinearLayout and negative margin with RelativeLayout. + Revise the look of the settings wheel based on new UI mock. + Add border to preview frame. + Make settings popup windows align with an invisible view in the root view. This makes it easier to adjust the location of the popup windows. Bug: 3156693 Change-Id: I8843fec803f8418699df7e425ea74af708b4ea99
* | | | | Merge "Log the exception stack so it is easier to debug."Wu-cheng Li2010-11-285-18/+12
|\ \ \ \ \
| * | | | | Log the exception stack so it is easier to debug.Wu-cheng Li2010-11-295-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove unnecessary assertion. Change-Id: If7a51ecf1f884d8cc8804b79b7d6c6242ee626ed
* | | | | | Merge "Remove the hard-coded package name in camera tests."Wu-cheng Li2010-11-286-25/+28
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Remove the hard-coded package name in camera tests.Wu-cheng Li2010-11-296-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | bug:3210567 Change-Id: I4bdc012bc39cb15459cdd6e03164be7d88e492d3
* | | | | Remove front/back camera switch from indicator wheel.Wu-cheng Li2010-11-263-4/+3
|/ / / / | | | | | | | | | | | | | | | | bug:3156676 Change-Id: Idb1052563356e54a27b2a5628c3db252d5f1ac54
* | | | Add title and its holo background for settings.Wu-cheng Li2010-11-266-48/+150
| | | | | | | | | | | | | | | | | | | | bug:3226752 Change-Id: I10d2430fb2db9283fa080284f9ad6c043d056865
* | | | Add front/back camera switchChung-yih Wang2010-11-2511-48/+296
| | | | | | | | | | | | | | | | | | | | bug:3156676 Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
* | | | Merge "Highlight camera/video icon when mode is changed."Hung-ying Tyan2010-11-2418-32/+156
|\ \ \ \
| * | | | Highlight camera/video icon when mode is changed.Hung-ying Tyan2010-11-2418-32/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Make camera/video icons on switcher radio buttons instead of RotateImageView for x-large devices. + Add icons for camera and video on different states (normal and checked) for x-large devices. + Add SwitcherSet.java that consists of the radio buttons and the Switcher and replace the camera_switch_set linear layout with it. + Replace Switcher with SwitcherSet in Camera and VideoCamera. Bug: 3156677 Change-Id: I1ea7b4d4149d0a8dc548086150a9ae1a616cd8de
* | | | | Move icons to mipmap.Ying Wang2010-11-235-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I3f6a1cc6c080c93c31291cb8294cce951f40ad93
* | | | | Merge "Fix various UI issues."Wu-cheng Li2010-11-236-67/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix various UI issues.Wu-cheng Li2010-11-226-67/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Increase the left margin of other setting popup window. 2. Replace TableLayout/TableRow with LinearLayout. 3. Increase the size of previous/next buttons in other setting popup window. 4. Rows in BasicSettingPopup and OtherSettingPopup now use the same layout style. Change-Id: I500cfed867367f997e40b559458d8d28ac27d2e2
* | | | | Merge "Use holo.dark background on popup windows."Wu-cheng Li2010-11-194-3/+21
|\ \ \ \ \ | |/ / / /
| * | | | Use holo.dark background on popup windows.Wu-cheng Li2010-11-194-3/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I1ed1dd3d23270d8da29bc446fa121067b98bb48e
* | | | | Merge "Remove the border of the preview frame."Wu-cheng Li2010-11-182-4/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove the border of the preview frame.Wu-cheng Li2010-11-182-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some UI componenets overlap with the preview frame. The border does not look good. Change-Id: Ie70c742851705d2a5851d56a6c9d87904188adde
* | | | | Merge "Import initial translations for 20 new locales."Eric Fischer2010-11-1820-0/+2737
|\ \ \ \ \