summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with jb-releaseandroid-sdk-support_r11android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r1android-cts-4.2_r2android-4.4w_r1android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3.1_r1tools_r22.2tools_r22tools_r21kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-devjb-mr2.0.0-releasejb-mr2-devjb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-dev-plus-aospjb-mr1-devidea133The Android Open Source Project2012-06-190-0/+0
|\
| * merge in jb-release history after reset to jb-devandroid-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr1.1-releasejb-mr1-releasejb-mr0-releaseThe Android Automerger2012-06-190-0/+0
| |\
* | \ Reconcile with jb-releaseandroid-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9kitkat-releasekitkat-cts-releasejb-mr2.0-releasejb-mr2-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | |/ / |/| / | |/
| * Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
* | Fix camera_control distorted in small resolution.android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devakahuang2012-06-153-4/+10
* | Remove UI entry for disco video recording effect.Pin Ting2012-06-1454-55/+0
|/
* Fix NPE when only front cameras are available.Angus Kong2012-06-134-26/+9
* Rename Camera to LegacyCamera for SDK inclusion.Eino-Ville Talvala2012-06-047-22/+22
* Fix the share popup. DO NOT MERGEAngus Kong2012-02-184-38/+9
* Import translations. DO NOT MERGEEric Fischer2012-02-088-50/+67
* Merge "Do not allow switching to other activities during panorama capture. (d...Wei Huang2012-01-201-0/+15
|\
| * Do not allow switching to other activities during panorama capture. (do not m...Wu-cheng Li2012-01-201-0/+15
* | Allow saving panorama after the activity is paused. (do not merge)Angus Kong2012-01-123-34/+75
|/
* Use default volume control stream instead of the music stream.Eino-Ville Talvala2012-01-051-2/+0
* Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-12-062-3/+3
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-12-062-3/+3
* | Fix crash after restoring defaults.Wu-cheng Li2011-12-061-0/+3
|/
* Import revised translations. DO NOT MERGEEric Fischer2011-11-293-5/+5
* Fix NPE if the camera cannot be connected.Wu-cheng Li2011-11-281-1/+1
* Dismiss open menu if exists.Chung-yih Wang2011-11-223-0/+11
* Merge "Update camera sound API." into ics-mr1Wu-cheng Li2011-11-214-8/+21
|\
| * Update camera sound API.Wu-cheng Li2011-11-184-8/+21
* | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-213-18/+18
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-213-18/+18
| |/
* / Fix share popup is not aligned with viewfinder.Wu-cheng Li2011-11-211-1/+1
|/
* Merge "Fix NPE in panorama when camera failed to connect." into ics-mr1Chih-yu Huang2011-11-181-20/+18
|\
| * Fix NPE in panorama when camera failed to connect.Chih-yu Huang2011-11-181-20/+18
* | Merge "Fix OpenGL processing when activity is not active." into ics-mr1Angus Kong2011-11-171-0/+6
|\ \ | |/ |/|
| * Fix OpenGL processing when activity is not active.Angus Kong2011-11-181-0/+6
* | Merge "Rotate priority indicators according to the device orientation." into ...Wei Huang2011-11-177-79/+57
|\ \ | |/ |/|
| * Rotate priority indicators according to the device orientation.Wu-cheng Li2011-11-177-79/+57
* | Merge "Fix EffectsRecorder error path handling when ending recording." into i...Eino-Ville Talvala2011-11-161-1/+7
|\ \
| * | Fix EffectsRecorder error path handling when ending recording.Eino-Ville Talvala2011-11-161-1/+7
* | | Merge "Update the panorama capturing progress correctly." into ics-mr1Wei-Ta Chen2011-11-161-17/+20
|\ \ \
| * | | Update the panorama capturing progress correctly.Wei-Ta Chen2011-11-151-17/+20
| | |/ | |/|
* | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-1649-148/+148
|\ \ \
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-1649-148/+148
* | | | Merge "Fix crash: camera swap w/ custom Background video" into ics-mr1Pannag Sanketi2011-11-161-4/+13
|\ \ \ \
| * | | | Fix crash: camera swap w/ custom Background videoPannag Sanketi2011-11-151-4/+13
* | | | | Merge "Fix the ArrayIndexOutOfBound issue." into ics-mr1Wei Huang2011-11-161-13/+17
|\ \ \ \ \
| * | | | | Fix the ArrayIndexOutOfBound issue.Chung-yih Wang2011-11-161-13/+17
* | | | | | am 30f26f91: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge "Broadcast for new image added in panorama mode." into ics-mr1Angus Kong2011-11-161-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Broadcast for new image added in panorama mode.Angus Kong2011-11-161-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-100-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Fix NPE if the device has only one camera.Wu-cheng Li2011-11-161-1/+3
| |_|/ / / / |/| | | | |
* | | | | | Merge "Set the orientation of a panorama image." into ics-mr1Wei-Ta Chen2011-11-153-5/+56
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Set the orientation of a panorama image.Wei-Ta Chen2011-11-153-5/+56
| | |_|_|/ | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-11 08:53:14 +0000