summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add metering mode support.Wu-cheng Li2010-06-116-2/+48
| | | | Change-Id: I8b964df4534da0b393479baddabfc85ce1b09b2f
* am b84acd02: Merge "Fixed the camera test instrumentation target naming ↵Yu Shan Emily Lau2010-06-101-2/+2
|\ | | | | | | | | | | | | | | | | issue." into froyo Merge commit 'b84acd02e46f87dead1fa75abb14427bf29ba8d8' into kraken * commit 'b84acd02e46f87dead1fa75abb14427bf29ba8d8': Fixed the camera test instrumentation target naming issue.
| * Merge "Fixed the camera test instrumentation target naming issue." into froyoYu Shan Emily Lau2010-06-101-2/+2
| |\
| | * Fixed the camera test instrumentation target naming issue.Yu Shan Emily Lau2010-06-091-2/+2
| | | | | | | | | | | | Change-Id: Ia98963e7ae38157d96a7fe3b70d37eca9c5f4af2
* | | am 432a1c68: Import revised translationsKenny Root2010-06-091-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '432a1c682221baadfb36d12c651a4092ea75ebcb' into kraken * commit '432a1c682221baadfb36d12c651a4092ea75ebcb': Import revised translations
| * | Import revised translationsKenny Root2010-06-091-3/+3
| |/ | | | | | | Change-Id: Ia5d2e7169014c35590ab1fe5ae5467d68f824d62
* | mParameters is initialized in preview thread and could be NULL inOwen Lin2010-05-311-2/+4
| | | | | | | | | | | | | | "initializeHeadUpDisplay()" Bug: 2728390 Change-Id: Iaf27fa940a9758dff816c0c945ead330a2e9ec3f
* | Show better message to users if camera fails to access sdcard.Wu-cheng Li2010-05-284-4/+18
| | | | | | | | | | | | | | Also print the exception if sdcard access fails. bug:2713104 Change-Id: I35a553ee75a49398582b587755d097b02b144015
* | Refactor the code. Improve the inheritance structure of Textures.Owen Lin2010-05-1717-371/+269
| | | | | | | | Change-Id: I72a78f97cf54a6505cd7bff98e1db1bdf5fa84c9
* | Using GL to draw NinePatchOwen Lin2010-05-174-87/+336
| | | | | | | | Change-Id: I2aa92bba691cbfde75523c196a880d0e18eeaba4
* | Merge "Fix issue 2622023: Clean up all hardcoded '/sdcard' in camera related ↵Ray Chen2010-05-144-11/+22
|\ \ | | | | | | | | | codes http://2622023" into kraken
| * | Fix issue 2622023: Clean up all hardcoded '/sdcard' in camera related codesRay Chen2010-04-304-11/+22
| | | | | | | | | | | | | | | | | | http://2622023 Change-Id: I10205ab378c863e2ffed460c83b0037311a6d1a1
* | | Initialize the HeadUpDisplay only once in the life time of the activity.Owen Lin2010-05-142-22/+25
| | | | | | | | | | | | | | | | | | And review the code so that mHeadUpDisplay won't be null when used. Change-Id: I335a25e64035627c30ec2c6f45c17566f0ea2420
* | | resolved conflicts for merge of ec1dfcb7 to krakenOwen Lin2010-05-1431-0/+495
|\ \ \ | | |/ | |/| | | | Change-Id: I5ea57293d0b34f4189983c7a9851555bcf5f5232
| * | Add copyright headers to source codes.Owen Lin2010-05-1330-0/+479
| | | | | | | | | | | | | | | | | | Bug: 2680376 Change-Id: I4d0b297f2cee13bb03104996f020732713c61e03
* | | Create a ColorTexture to draw pure color in GL.Owen Lin2010-05-1315-28/+86
| | | | | | | | | | | | Change-Id: I9dfa69b6037397d01a43c976b2d02acb16f2af62
* | | am e3911500: Fix 2672651 When GPS is disabled, GPS EXIF data is still in the ↵Ray Chen2010-05-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | photo http://2672651 Merge commit 'e391150007300e63d3fb6e2236db3f4c9247fb9c' into kraken * commit 'e391150007300e63d3fb6e2236db3f4c9247fb9c': Fix 2672651 When GPS is disabled, GPS EXIF data is still in the photo
| * | Fix 2672651 When GPS is disabled, GPS EXIF data is still in the photoRay Chen2010-05-111-0/+1
| | | | | | | | | | | | | | | | | | http://2672651 Change-Id: I7992574e978bba1f65c01c942220b0d435b45029
* | | Initialize zoom in "InitializeSecondTime" so that we can get correct values forOwen Lin2010-05-111-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zoom ratios. Bug: 2643926 The zoom ratios are changed when the preview size changes. We need to read it i again to get the latest values. Change-Id: I64a248eba2aa63456f14452ffccaeaab090cc748
* | | Handle events in the main thread and use GLThread only as a rendering thread.Owen Lin2010-05-1030-303/+218
| | | | | | | | | | | | | | | | | | Coordinate the two threads by synchronizing on the GLRootView instance. Change-Id: I94459f6afeb468660df7219800bc48b621edecd4
* | | Move the texture coordinate 0.5 pixel inner so that GL won't get garbageOwen Lin2010-05-073-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | data. So that GL won't get garbage data when do sampling. Change-Id: I58a88c2fb1166e0c3991edfd320c69633c89d102
* | | Merge "Use our own EGLChooser so that we can fall back to use "copyImage2D" ↵Owen Lin2010-05-068-49/+161
|\ \ \ | | | | | | | | | | | | when stencil is not supported. Also fix an issue in GLListView due to a different behavior on Emulator, i.e., ACTION_MOVE won't be sent after ACTION_DOWN." into kraken
| * | | Use our own EGLChooser so that we can fall back to use "copyImage2D" whenOwen Lin2010-05-078-49/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stencil is not supported. Also fix an issue in GLListView due to a different behavior on Emulator, i.e., ACTION_MOVE won't be sent after ACTION_DOWN. Bug: 2538315 Change-Id: I8eb26794656b42df1c89e675bc153879920a7155
* | | | am aefb028c: Nudge the camera preview 2dip from the screen edge.Daniel Sandler2010-05-062-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Merge commit 'aefb028cb120b2908038f459e33b61d18ad32417' into kraken * commit 'aefb028cb120b2908038f459e33b61d18ad32417': Nudge the camera preview 2dip from the screen edge.
| * | 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
* | | am 0055c650: Merge "b/2483367 Moving OneTimeInitializer to vendor/google" ↵Michael Chan2010-05-032-167/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | into froyo Merge commit '0055c650940d5c4dbc75998e362c645ec358ec45' into kraken * commit '0055c650940d5c4dbc75998e362c645ec358ec45': b/2483367 Moving OneTimeInitializer to vendor/google
| * Merge "b/2483367 Moving OneTimeInitializer to vendor/google" into froyoMichael Chan2010-05-032-167/+0
| |\
| | * b/2483367 Moving OneTimeInitializer to vendor/googleMichael Chan2010-04-292-167/+0
| | | | | | | | | | | | | | | | | | See ee510dbe764abbc7bf74c0bb214f4c9a09b87fe8 Change-Id: I9da94242451ead99c1b26796a4dc554a9d3a6503
* | | am 739ab183: Import revised translationsKenny Root2010-04-291-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '739ab183c50f2d670357dfcc49653cdef2fc9b5b' into kraken * commit '739ab183c50f2d670357dfcc49653cdef2fc9b5b': Import revised translations
| * | Import revised translationsKenny Root2010-04-291-1/+1
| | | | | | | | | | | | Change-Id: Id797436a1fe841a4ed068c23ecb9aeb907e29ec3
* | | Improve the Texture by using glTexSubImage to upload the image content.Owen Lin2010-04-293-27/+23
|/ / | | | | | | | | | | | | So that we can prevent create another Bitmap just to satisfied the limit that the width and height must be power of 2. Change-Id: Ie0cdb1e944fb2bf928464955851fe62d00394d70
* | Import revised translationsKenny Root2010-04-273-12/+12
|/ | | | Change-Id: Ife0e63f97c1cd90bcb397098b31116a1d3421e85
* Avoid loading drawables in CameraSettings.Owen Lin2010-04-264-51/+88
| | | | | | Bug: 2430326 Change-Id: Ia5e6f4320fac3a89ede5054e9ac7b6f31c973273
* Merge "Startup time improvements. Bug: 2430326" into froyoChih-Chung Chang2010-04-233-21/+19
|\
| * Startup time improvements.Chih-Chung Chang2010-04-233-21/+19
| | | | | | | | | | | | Bug: 2430326 Change-Id: I36dde4cee9f086e468caf87378ce1f2fd0d011c7
* | Remove unused state in some resources.Owen Lin2010-04-2313-30/+0
|/ | | | | | Change-Id: I7acfd20cb77ace0c953b0f349a64fc85cc334365 Bug: 2557840
* Reset scece mode overrides in InitializeHeadUpDisplay.Owen Lin2010-04-211-37/+38
| | | | | bug: 2612518 Change-Id: I1b349f3b52cb2f474fa1b0790cc1f8fbecb0b9aa
* Remove GLRootView in onPause() and put it back in onResume() to avoid OOM inOwen Lin2010-04-216-109/+126
| | | | | | | | Gallery. Bug: 2557840 Change-Id: I2d6ff6da25bfe342472278efd5fc25c38d5fd5ce
* Merge "Fix bug: 2609027." into froyoOwen Lin2010-04-211-1/+1
|\
| * Fix bug: 2609027.Owen Lin2010-04-211-1/+1
| | | | | | | | Change-Id: Ic59f542f50c401492770423f98546e34a70fa2ef
* | Don't stop user from taking pictures while the media scanner is scanning.Chih-Chung Chang2010-04-201-10/+3
|/ | | | | | Bug: 2603078 Change-Id: Ic2159201434083919d7f7bc6b1ea2f3438971ebd
* Always encode GpsTimeStamp in Camera.Ray Chen2010-04-161-0/+3
| | | | | | Bug: 2596154 Change-Id: I00f40032e7db512ab09f6a66e5db7dbef8dc8e27
* Add aboutToChange to GLRootView.Owen Lin2010-04-132-7/+15
| | | | | | | This allow user to notify GLRootView to expect a size change in a near furture. Change-Id: I8ea2a00c90f0d25c06ee9b292fa9defa2f379abd Fix: 2591831
* Add a hack to avoid allocating GL surface with different sizes.Chih-Chung Chang2010-04-091-0/+34
| | | | | | Bug: 2515291 Change-Id: Ib0d886dcd355ddd3af09cc31089ed8c446911536
* Fix a typo in the code.Owen Lin2010-04-081-1/+1
| | | | | Bug: 2580309 Change-Id: I25ade485a56230b919d07698e1f9d9f25baaa5b8
* Merge "Fix the ANR after switching between Camera and Camcorder." into froyoChih-Chung Chang2010-04-073-33/+56
|\
| * Fix the ANR after switching between Camera and Camcorder.Owen Lin2010-04-083-33/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | The reason of this bug is we try to queue an event in the GLThread, but the thread has already dead when the GLRootView detacched from the window. So, we are waiting a task that will never be executed. I have seen a similar ANR in GLRootView.onTouch(), so I also fix the that issue in this change. Bug: 2559472 Change-Id: I49efd9ca01f1f6cce73320c31448ebaa7687469f
* | Merge "Make shortcut upgrading code a bit more robust. Bug: 2558040" into froyoChih-Chung Chang2010-04-071-10/+10
|\ \
| * | Make shortcut upgrading code a bit more robust.Chih-Chung Chang2010-04-071-10/+10
| |/ | | | | | | | | | | Bug: 2558040 Change-Id: Id2fac56bd4c6082039c48648a757ff228217c713
* | Do not register OneShotPreviewCallback to reduce latency.Wu-cheng Li2010-04-082-39/+24
| | | | | | | | | | bug:2430326 Change-Id: I14f10f1317096966edc094fc4df8691ec20fee11