summaryrefslogtreecommitdiffstats
path: root/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* "Retake" and "Ok" buttons can function correctly.Angus Kong2011-08-113-0/+4
| | | | | | | | | | | 1. "Retake" button brings user back to preview stage without saving the final result. 2. "Ok" button brings user back to preview stage after saving the final result. bug:5031609 bug:5142100 bug:5134202 bug:5133871 Change-Id: I234e242182765cc5624b2fc8444bc38e5a9edf9f
* Remove share icon and close arrow.Wu-cheng Li2011-08-102-15/+5
| | | | | | | | | | Alose increase the speed of icon rotation. bug:5141343 bug:5141404 bug:5141514 Change-Id: I0db6b6edbc0fc1a0f83b4f29f6828bcff01bf0c4
* Do not show mode picker in intent modes.Wu-cheng Li2011-08-091-1/+2
| | | | | bug:5107643 Change-Id: I0f8377e72e5e2b9c2947ef396afe12dda2c6c7c1
* Use new background and shutter button.Wu-cheng Li2011-08-0911-36/+31
| | | | | | bug:5024054 Change-Id: I2def331433b0db66efc0d38f1e9537c0980441bb
* Updates for mosaic preview rendering to happen using native GLES2.0 code.mbansal2011-08-051-10/+13
| | | | | | | | | | | | | 1) Added new subfolder mosaic_renderer in feature_mos/src with FrameBuffer and WarpRenderer classes. 2) Added mosaic_renderer_jni.h|cpp files to the jni folder to perform GL calls for rendering on the GL thread. 3) Updated code in feature_mos_jni.cpp to connect with mosaic_renderer_jni.cpp. 4) Added new java files in com.android.camera.panorama to encapsulate the GL JNI interface, a GLSurfaceView for display and a GLSurfaceView.Renderer for rendering. 5) Modified APP code to enable the new GL-based rendering and made relevant changes to the UI (in pano_views.xml). 6) Fixed a GL bug which was preventing the rendering from working properly after hitting the back button once. 7) Preview rendering now displays in the current frame coordinate system. 8) Fixed the ghost preview rendering bug. Change-Id: Ieb64ee3fd4a9a2c6563a311a4930ddc85ce2247c
* Use View.GONE instead of View.INVISIBLE.Chung-yih Wang2011-08-054-5/+5
| | | | | | Refactor this to improve the performance. Change-Id: I6a20021bf07546b0cfa6b4c4b5fe0d67556940a5
* Merge "Add the CameraPicker for PhoneUI."Chung-yih Wang2011-08-053-9/+16
|\
| * Add the CameraPicker for PhoneUI.Chung-yih Wang2011-08-053-9/+16
| | | | | | | | | | | | +recover the removed CameraPicker. Change-Id: I5e45c4f73ce7c082cf420d27a86b922283a83bcc
* | Stop button added on panorama UI.Angus Kong2011-08-054-22/+115
| | | | | | | | | | | | | | | | | | 1. Individual layout XML file added for preview, capture and review stages. 2. Stop button added for capture stage. 3. Layout changed to comply UI spec more. bug:5031609 Change-Id: I152daafe8a1a9fcc12b3803f3f7a36875b425628
* | Merge "Make Panorama run on phone."Wei-Ta Chen2011-08-041-2/+2
|\ \
| * | Make Panorama run on phone.Wei-Ta Chen2011-08-031-2/+2
| |/ | | | | | | Change-Id: I41ff1c35918794e81d4f397ed72f438dadccde4a
* | Add face detection UI.Wu-cheng Li2011-08-041-0/+25
|/ | | | | bug:4460717 Change-Id: Id09cc012efffcee0f5af3a070b5dcb775a7048a0
* Merge the indicator bar implementations.Chung-yih Wang2011-08-0412-8/+256
| | | | | | | | | | | | bug:5039235 Originally we have the GLView-implemented indicators for Phone-based UI. Based on the current UI design, we would like to merge the look on all devices for the dialog of the camera setting. Therefore, a refactor of how to handle the popup window is required here and this will simplify our UI work for handling different layout/resolution. Change-Id: I6f9e6ebed7600be460ddd906505cdc44f81098ad
* Add mode picker for camera/camcorder/panaramorepo sync2011-07-294-25/+57
| | | | | | | | +remove camera switcher +add menu item for panorama bug:5039225 Change-Id: Ib065074026760f7dc1bd1dfe694935f46bb8c407
* Check in the Mosaic Stitching codes.Wei-Ta Chen2011-07-274-1/+100
| | | | | | | | | | 1. Camera setup moved to activity level. 2. Fixed releasing and acquiring camera process. 3. Unused .xml files removed. 4. Style issues fixed. Bug: 5031489 Change-Id: Ifd271588ca2168398e17f204f065681ead2d8f2f
* Merge "Add a share application list in share popup."Wu-cheng Li2011-07-173-28/+111
|\
| * Add a share application list in share popup.Wu-cheng Li2011-07-183-28/+111
| | | | | | | | | | | | bug:4725978 Change-Id: Id7a8b24fd7785f2d7dd316b5000f8ae3f3e8c567
* | Merge the different implementations on CameraSwitch.repo sync2011-07-161-2/+2
|/ | | | | | | +enable the camera/video icon rotation for tablet version. +render disabled effect for tablet only. Change-Id: I2827cb57ac7d8d60efdb6f3172c89db32ac443d4
* Fix wrong preview border drawable is displayed in phone UI.Wu-cheng Li2011-07-112-2/+2
| | | | Change-Id: Iccee528e8e3681f22480a0b726dac90c46757a5f
* Add expanded thumbnail in phone UI.Wu-cheng Li2011-07-052-5/+36
| | | | | | bug:4725968 Change-Id: I2a59a3714b93bc96f2a1689d948c9e4e0edd14cb
* Move the shutter button to the center in phone UI.Wu-cheng Li2011-06-292-24/+22
| | | | | bug:4973470 Change-Id: I18bae830c433726e36ef655032be8330932826fd
* Move share button beside thumbnail in phone UI.Wu-cheng Li2011-06-281-7/+24
| | | | | | bug:4725968 Change-Id: Iedd0b631b48bb30c27975ddc44923886e4b0d862
* resolved conflicts for merge of aae0cba5 to masterWu-cheng Li2011-05-262-2/+2
|\ | | | | | | Change-Id: I681c7f38abaed6705640c4e79e06a581990ec496
* | Move gps indicator from the indicator bar to the corner.Wu-cheng Li2011-05-261-0/+14
| | | | | | | | | | | | bug:4391419 Change-Id: I5d4385edd51d3df21d4bcdd17a80dc778a832b94
* | Fix the wrong RotateImageview package declaration.Wu-cheng Li2011-05-252-3/+3
| | | | | | | | Change-Id: I19ee665d6d6d33b6572b0523b29cd8d851a6c642
* | Show review image before share.Wu-cheng Li2011-05-172-4/+10
| | | | | | | | | | | | bug:4391419 Change-Id: Id357539bfe36eb3a30742dc4f8ca267ff53ff8b7
* | Refactor preview frame layout.Wu-cheng Li2011-05-122-8/+10
| | | | | | | | Change-Id: Ief0acb3841078a36974e315054110bd9070a1f3f
* | Remove unused code and resource.Wu-cheng Li2011-05-125-25/+0
| | | | | | | | Change-Id: Ia6d98847716ef187eefd05758c5c61b530967b27
* | Reduce the size of focus rectangle.Wu-cheng Li2011-04-281-2/+2
| | | | | | | | | | | | | | | | Now the length of focus rectangle is 1/4 of the height of preview frame. bug:3475893 Change-Id: Ib1f09d5dbb25bb20343b39116c12febe08d83051
* | Add touch to focus.Wu-cheng Li2011-04-191-4/+4
|/ | | | | | bug:3475893 Change-Id: I4b23052a6e548adf5b209d46661590b79b8cb557
* Fix crash in non-xlarge configuration.Wu-cheng Li2011-01-202-8/+14
| | | | Change-Id: I415c470beb5d340e7c193fd6ee17ca9c1ec172b2
* Fix the camera layout in image capture intent mode.Hung-ying Tyan2010-12-021-0/+1
| | | | | Bug: 3226748 Change-Id: I0f01f4848aee7c8f82f785c5e42266d6247d06b4
* Increase camera preview frame size and other changes.Hung-ying Tyan2010-11-262-2/+2
| | | | | | | | | | | | | | | + 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
* Highlight camera/video icon when mode is changed.Hung-ying Tyan2010-11-241-3/+3
| | | | | | | | | | | | | + 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 some classes out from Camera.java.Wu-cheng Li2010-11-131-1/+1
| | | | Change-Id: I455d6878feeacb3d44d80d899e8c948e1d28fca2
* Change the thumbnail list to a single thumbnail.Wu-cheng Li2010-11-132-9/+26
| | | | | | | UI was re-designed. bug:3156693 Change-Id: I766aab7dce9030f3b2800ea0995e7f4e118241a6
* Move camera UI elements to their own xml files.Hung-ying Tyan2010-11-126-51/+139
| | | | | | | | | | | | | | | | | | | | | Hopefully with this CL, the code doesn't need to worry about the placement of the UI elements. Change details: + Move preview frame out of camera.xml and video_camera.xml. --> create preview_frame.xml and preview_frame_video.xml in both layout/ and layout-xlarge/. + Move thumbnail list view out of camera.xml and video_camera.xml. --> create thumbnail_list.xml in layout-xlarge/. + Make camera.xml and video_camera.xml a pure container which includes other UI elements. + Create camera_attach.xml and video_camera_attach.xml for the attachment scenario with its own camera control and no thumbnail list. + Camera and VideoCamera are modified accordingly. + Remove redundant RelativeLayout container in camera_control.xml. + Also fix a layout bug in PreviewFrameLayout.java. Change-Id: Ief556c9aa77b0322312bb46ce1d274df3a26aa4d
* Change setting picker to popup window.Wu-cheng Li2010-11-123-10/+9
| | | | | | | UI was re-designed. bug:3156666 Change-Id: Id40fab084f59cdeca8e2991dc8b3768fcac8e0bf
* Change recording time position for xlarge layout.Wu-cheng Li2010-10-181-11/+4
| | | | | | Move recording time to the top right of the camera control panel. Change-Id: I8c13d2903f568d479d1aa963c6f0955e3126860c
* Use cache to reduce thumbnail latency.Wu-cheng Li2010-10-041-2/+2
| | | | Change-Id: Ibf40c2f0e4bd229ec7065b94d439edaac6968b0f
* Add last captured image thumbnails for xlarge devices.Wu-cheng Li2010-09-281-0/+21
| | | | Change-Id: I96d5472b62a7ffcc57642c09a0a7567a19f6ed42
* Use theme to display background to reduce perceived latency.Wu-cheng Li2010-09-202-2/+0
| | | | | | | | | | Now system picks up the camera background as soon as the app starts. Originally users would see the app startup with the default theme and its dark background. The camera background would only appear after the inflation of the content view and the first layout/drawing pass. Change-Id: I9003b37b1a958c78f5fd804de9fedeb23bd90fc9
* Added live diplay of recorded video time for time lapse capture.Nipun Kwatra2010-08-271-1/+1
| | | | | | | | | | | | | Since the length of time lapse video is different from the length of the actual wall clock time elapsed, we display the video length alongside the wall clock time. - Moved creating of hh/mm/ss string from milliseconds to millisecondToTimeString() function. - Added getTimeLapseVideoLengthString() which computes the video length from elapsed time, capture rate and frame rate. Change-Id: Ifea0a4f8376ad09f4a0a5a14aa3f96ac48fd27dd
* Nudge the camera preview 2dip from the screen edge.Daniel Sandler2010-05-062-0/+2
| | | | | | | | | | | | On Sapphire, the preview background was right up against the edge of the screen; since that portion of border_view_finder.9.png is very dark, it looked as if there was no border at all. Now there's a guaranteed 2dip of bg_camera_pattern.png texture visible to the left of the viewscreen. Bug: 2655309 Change-Id: I4d4f45542700b8b0fec564b72895e42d9dd29da3
* Remove GLRootView in onPause() and put it back in onResume() to avoid OOM inOwen Lin2010-04-212-8/+0
| | | | | | | | Gallery. Bug: 2557840 Change-Id: I2d6ff6da25bfe342472278efd5fc25c38d5fd5ce
* Remove unused resources and code.Owen Lin2010-04-072-259/+0
| | | | Change-Id: I394352f9da02d2585b2635e07c96bfa1c942d070
* Fix several UI issues.Owen Lin2010-03-164-106/+0
| | | | | | | | | | | 1. Remove the cross in border_last_picture 2. Remove the gripper in VideoCamera 3. Solve the popup triangle locate in wrong position 4. Remove the top and bottom borders of the preview frame in Camera 5. Rotate the on-screen indicators when orientation changed 6. Add the checking for the flash mode in VideoCamera Change-Id: I304ea3582d08c5e46ed750b7371588635a4d8009
* New UI for camcorder.Owen Lin2010-03-141-20/+4
| | | | Change-Id: Id35564836da7b4051662cccfd0920480421499b0
* Camera should have the com.android.camera package name.Romain Guy2010-03-103-3/+3
| | | | | | Related to bug #2464545 Change-Id: I08f5cce5b0df623fc62683bd9c9d4a1aa0694240
* Unbundle: change camera package name.Chih-Chung Chang2010-03-083-3/+3
| | | | Change-Id: I9b101ea486f06be553104bc4879f5ec66ae014bc