summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Override other camera settings when scene mode is active.Wu-cheng Li2010-11-306-14/+111
| | | | | | 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-294-15/+33
|\
| * Move scene mode to indicator wheel.Wu-cheng Li2010-11-294-15/+33
| | | | | | | | | | bug:3156671 Change-Id: I8e663f7bfde805eeef06bf4f3d9b883a58e51ce5
* | 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
* | Make camcorder recording time appear again.Hung-ying Tyan2010-11-291-1/+1
|/ | | | | | Last CL introduces a bug making it disappear. Change-Id: I3ed4f1777d73f130aad3c4c7a20fedf160a2c86b
* Increase camera preview frame size and other changes.Hung-ying Tyan2010-11-263-24/+34
| | | | | | | | | | | | | | | + 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
* Remove front/back camera switch from indicator wheel.Wu-cheng Li2010-11-262-4/+2
| | | | | bug:3156676 Change-Id: Idb1052563356e54a27b2a5628c3db252d5f1ac54
* Add title and its holo background for settings.Wu-cheng Li2010-11-264-35/+99
| | | | | bug:3226752 Change-Id: I10d2430fb2db9283fa080284f9ad6c043d056865
* Add front/back camera switchChung-yih Wang2010-11-255-46/+214
| | | | | bug:3156676 Change-Id: I8a5394aefa068cb099b89c5739abf0cfd78591a9
* Merge "Highlight camera/video icon when mode is changed."Hung-ying Tyan2010-11-244-21/+103
|\
| * Highlight camera/video icon when mode is changed.Hung-ying Tyan2010-11-244-21/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | + 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
* | Fix various UI issues.Wu-cheng Li2010-11-222-9/+16
|/ | | | | | | | | 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
* Use holo.dark background on popup windows.Wu-cheng Li2010-11-192-0/+20
| | | | Change-Id: I1ed1dd3d23270d8da29bc446fa121067b98bb48e
* Rotate the postview to correct orientation in video attach mode.Wu-cheng Li2010-11-182-4/+32
| | | | | | Manual merge from gingerbread. bug:3208306 Change-Id: Ib7fb0a960c862527324adefd419e74224f59bc30
* Adapt the file extension of the recorded files to the requested file format.James Dong2010-11-171-3/+8
| | | | | | bug - 3202417 Change-Id: Icb865419abc47726dc59c3fada4e4d789430b78a
* Add background for indicator wheel.Wu-cheng Li2010-11-173-26/+89
| | | | | bug:3156688 Change-Id: I91465730cc2ac9c586122573c1ac73ba48cc0cc9
* Overlay camera/camcorder switch to preview frame.Hung-ying Tyan2010-11-171-2/+1
| | | | | | | | | | | | | | | + add new mode switch knob. + add new background to mode switch view. + add transparent background to entire switcher view. + adjust sizes and margins of camera_control and review_thumbnail according to UI spec. + adjust sizes and margins of mode switch view according to UI spec. + fix a bug in Switcher where drawing the drawable should not take into account the left/right paddings. Bug:3156677 Change-Id: I1e452e5a519aa3fc2cfef418dde6a7c196c8547a
* Fix NPE in releaseMediaRecorder.Wu-cheng Li2010-11-161-2/+3
| | | | | bug:3196125 Change-Id: If3f5ee415f29312366abcb775ffd5ca0cb5df184
* Set video orientation hint according to device orientation.Wu-cheng Li2010-11-134-145/+162
| | | | | | | | | | | | Also rotate the on-screen icons according to device orientation. Move prepare to startVideoRecording because we need to set the latest orientation to MediaRecorder.setOrientationHint. setOrientationHint has to be called before prepare. Manual merge from gingerbread. bug:3163671 Change-Id: Ieeb4ed9a2777308a70cdd1242e5abf7867ead8c9
* Move some classes out from Camera.java.Wu-cheng Li2010-11-133-59/+100
| | | | Change-Id: I455d6878feeacb3d44d80d899e8c948e1d28fca2
* Change the thumbnail list to a single thumbnail.Wu-cheng Li2010-11-133-242/+2
| | | | | | | UI was re-designed. bug:3156693 Change-Id: I766aab7dce9030f3b2800ea0995e7f4e118241a6
* Various UI changes.Wu-cheng Li2010-11-132-15/+37
| | | | | | | | - Add video quality to the indicator wheel. - Remove the head-up display in camcorder app from xlarge devices. - Move recording time down a little bit. - Align the zoom control to the left of control panel. Change-Id: I0732e80edd80a703bcb2350fb4bb01a2c473e6a5
* Camera App: Properly re-init ControlPanel on sensor switch.Andrei Warkentin2010-11-132-16/+29
| | | | | | | | | | | Handle cases where there are less/more settings after switch, for example caused by switching from a sensor without flash to a sensor with flash. Change-Id: I56a556f03679ab37c12f5918b09f6ac252c2ae3b Signed-off-by: Andrei Warkentin <andreiw@motorola.com> bug:3166542
* Close the camera application immediately when media server dies.Wu-cheng Li2010-11-133-19/+40
| | | | | | | | | | | Crash the app earlier. Otherwise, the app will crash later in other places and the log is gone. Getting a new Camera object is not good because it's hard for the app to reset the current state. For example, the state can be autofocus, preview, snapshot, recording, saving thumbnail. bug:3178948 Change-Id: Ibb38e6bfe927ed2ab9b87e2ee47044be8b96727b
* Move camera UI elements to their own xml files.Hung-ying Tyan2010-11-123-36/+28
| | | | | | | | | | | | | | | | | | | | | 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-126-115/+163
| | | | | | | UI was re-designed. bug:3156666 Change-Id: Id40fab084f59cdeca8e2991dc8b3768fcac8e0bf
* Fix the crash on tapping settings button when in front camera mode.Wu-cheng Li2010-11-124-4/+24
| | | | | bug:3166485 Change-Id: I1c89a1fbfd5689d9881a7e62e4fac91770728368
* Revert "Close the camera application immediately when media server dies."Wu-cheng Li2010-11-113-40/+19
| | | | This reverts commit 9cdae7b99f46a9a18bc2661d487f6f1e003f45ae.
* Close the camera application immediately when media server dies.Wu-cheng Li2010-11-113-19/+40
| | | | | | | | | | | Crash the app earlier. Otherwise, the app will crash later in other places and the log is gone. Getting a new Camera object is not good because it's hard for the app to reset the current state. For example, the state can be autofocus, preview, snapshot, recording, saving thumbnail. bug:3178948 Change-Id: I28a8b962d39d488f374a6f14550655d516a696bc
* Add GPS on-screen indicator UI.Hung-ying Tyan2010-11-101-0/+29
| | | | | Bug: 3156684 Change-Id: I8985359e9f31df656cbf27024323da7ff33bac92
* Add new layout file for camera.Hung-ying Tyan2010-11-092-6/+5
| | | | | | | | | | + Copied the layout file from res/layout and put it in res/layout-xlarge. + Changed FrameLayout to RelativeLayout in the new layout file. + Replace FrameLayout with View/ViewGroup in the code as it's not layout specific. Bug: 3156684 (in progress) Change-Id: Ife35528c08bc0e35793a0ff645ec9a7260c842c1
* resolved conflicts for merge of 86b149d9 to masterWu-cheng Li2010-11-091-1/+1
|\ | | | | | | Change-Id: Ida51ce14cbee3071cc26448e39bec05d505c8947
| * Set audio input source type to CAMCORDER in camcorder app.Wu-cheng Li2010-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to Froyo release, the media framework (pv opencore in particular) was forcing the audio input source type to CAMCORDER whenever the capture was for video and audio. This is not true anymore on gingerbread with stagefright. The proposed solution is to specify the audio input source as CAMCORDER in the camera app, and not enforce it in the framework. Enforcing it in the framework removes flexibility like recording from the front camera with a mic different from the back mic on platforms with 2 mics and 2 cams. bug:3171482 Change-Id: I5024ebb453054bfc0fcafedcdc78d98b0393bf81
* | am c309fcde: am 35c8657f: Merge "Remove ↵Wu-cheng Li2010-11-081-2/+1
|\ \ | |/ | | | | | | | | | | android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbread * commit 'c309fcde67648ae483cab117a956ce11cf065ffd': Remove android.hardware.Camera.CAMERA_ID_DEFAULT.
| * Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbreadWu-cheng Li2010-11-081-2/+1
| |\
| | * Remove android.hardware.Camera.CAMERA_ID_DEFAULT.Wu-cheng Li2010-11-081-2/+1
| | | | | | | | | | | | | | | bug:3173302 Change-Id: I2141456f3577e504e173a46efdbb343e03aaa5f5
| * | Set video orientation hint according to device orientation. do not mergeWu-cheng Li2010-11-083-147/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rotate the on-screen icons according to device orientation. Move prepare to startVideoRecording because we need to set the latest orientation to MediaRecorder.setOrientationHint. setOrientationHint has to be called before prepare. bug:3163671 Change-Id: I69efe7408aa5d47e2ef9bbab9dd4337a10d56814
| * | Enable front-facing camera recording. do not mergeWu-cheng Li2010-11-082-13/+6
| |/ | | | | | | | | bug:3163671 Change-Id: I88ea7c93aa6a08fb1cd529c3f5ad448399daba37
| * Remove front-facing camera recording. do not mergeWu-cheng Li2010-11-043-6/+21
| | | | | | | | | | | | | | | | The video looks upside down when the phone is held in portrait. Remove front-facing camera recording before we have a complete fix. bug:3163671 Change-Id: I453a21739c9ba387dd02be94bef5f92428e371f1
* | Rename some classes and method names to avoid confusion.Wu-cheng Li2010-11-047-42/+42
| | | | | | | | | | bug:3156674 Change-Id: Ia907303880bf806e66431a527a6b778762296796
* | Add other settings to control panel.Wu-cheng Li2010-11-026-37/+324
| | | | | | | | | | | | Head-up display is removed from xlarge devices. Change-Id: I4e05076ae368a7e288d56a092ffb92e9eee8376e
* | am 89213eb3: am 12a1f7a2: Fix the bug that wrong profile is selected after ↵Wu-cheng Li2010-10-261-1/+5
|\ \ | |/ | | | | switching camera
| * Fix the bug that wrong profile is selected after switching cameraWu-cheng Li2010-10-261-1/+5
| | | | | | | | | | bug:3132055 Change-Id: Ic493cf7ceef40c0e8a9cd8c2850f7b8f09b482fc
* | Add other setting icon in indicator wheel.Wu-cheng Li2010-10-252-5/+14
| | | | | | | | Change-Id: Iab326b5b75cacaf6a2e70de9faed28291665d1d7
* | Rename some classes to avoid confusion.Wu-cheng Li2010-10-244-7/+7
| | | | | | | | Change-Id: Ie6895470d3aadd0a53fb69a3048039b7d8b4c524
* | Add color effect UI to indicator wheel.Wu-cheng Li2010-10-212-0/+2
| | | | | | | | Change-Id: I9f6724e6b5410fa4758dc0f0d4d28c5dc377567a
* | Merge 559a4151 from gingerbread-plus-aospJean-Baptiste Queru2010-10-192-12/+20
|\ \ | |/ | | | | Change-Id: I8ec4aa5210cb5104bedb7d5ed6f823f44517b203
| * Fix wrong usage of setRotation and setOrientation.Wu-cheng Li2010-10-192-12/+20
| | | | | | | | | | bug:3105659 Change-Id: Ie2c1559cc03ece66705c1d766bea0e736f2684bc
* | am 03f097a0: am a7c1c50e: Merge "Fix wrong aspect ratio of camera preview." ↵Wu-cheng Li2010-10-181-13/+2
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit '03f097a09297ac400d340b3c4ffff4a9312da4f0' * commit '03f097a09297ac400d340b3c4ffff4a9312da4f0': Fix wrong aspect ratio of camera preview.
| * Fix wrong aspect ratio of camera preview.Wu-cheng Li2010-10-181-13/+2
| | | | | | | | | | | | | | | | | | Surface view must match the preview size ratio. Deduct all paddings while calculating the width and height of surface view. bug:3104492 Change-Id: I0d87a1c531f51fe74dd62b59f32dc40b1d1fb84d
generated by cgit v1.1 at 2025-02-14 18:56:56 +0000