summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-010-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-0149-93/+482
|\ \ \ \
| * | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-0149-93/+482
| | | | | | | | | | | | | | | | | | | | Change-Id: I75cf04fbc27b7c31c3f137d2ae7cda36c505b28d
* | | | | Merge "Replace hardcoded value with public API constant" into ics-mr1James Dong2011-11-011-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Replace hardcoded value with public API constantJames Dong2011-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I711a6623208f95385a62c72aaec8d95e6e064b3d related-to-bug: 5343832
* | | | | am 4d55f6cb: Merge "Remove long pressing shutter triggers autocous." into ↵Chih-Chung Chang2011-11-013-55/+3
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | ics-mr0 * commit '4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89': Remove long pressing shutter triggers autocous.
| * | | Merge "Remove long pressing shutter triggers autocous." into ics-mr0Chih-Chung Chang2011-10-313-55/+3
| |\ \ \
| | * | | Remove long pressing shutter triggers autocous.Wu-cheng Li2011-10-283-55/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autoFocus behavior has changed in CAF. The focus callback will not return immediately if CAF is scanning. There is no need to have long pressing behavior. bug:5514415 Change-Id: Iacf14fa3ad48b03c79122296a74e7511c41ea62f
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: Iac50ef267d3cef8ea4b8c4664d16c9d17e48ed23
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-300-0/+0
| |\ \ \ \
* | \ \ \ \ am 174b8b7f: Add forced sound for panorama mode.Angus Kong2011-10-311-0/+42
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | | * commit '174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d': Add forced sound for panorama mode.
| * | | | Add forced sound for panorama mode.Angus Kong2011-10-311-0/+42
| |/ / / | | | | | | | | | | | | | | | | bug:5538024 Change-Id: I59b662a0cc53471ba905391c016c78ebd9ae1d73
* | | | am b7a98c9f: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-290-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b7a98c9f0d7a839ef055ba5298d782252ceb6b7b': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-10-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: If7a3333b2c52feb0699382c7245d4a846ba1876e
* | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2832-813/+813
|\ \ \ \
| * | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2832-813/+813
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc5cd5ba52fa59661023678ee333ea7b5f7d5362
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-280-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I30eb46fd2f4d4cc8ef109ab2add457119901975b
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-280-0/+0
| |\ \ \ \
| | * \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-260-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-240-0/+0
| | | | |\ \ \
* | | | | \ \ \ am c3a0c2d4: Update recording orientation in more states.Eino-Ville Talvala2011-10-281-2/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'c3a0c2d4b7c1ec7bd8dc6190a0a68a6ff90cb629': Update recording orientation in more states.
| * | | | | | | Update recording orientation in more states.Eino-Ville Talvala2011-10-281-2/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once effects preview was started, no changes to recording orientation would take effect. This results in incorrectly oriented videos for the front camera, if the device is rotated after an effect is selected and before recording is started. Bug: 5531485 Change-Id: I0b59d72d446275f4a3b8dc7aabc98783efdd17cb
* | | | | | | Show video snapshot toast in first use.Chih-yu Huang2011-10-289-12/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5494290 Change-Id: I7cb498ef50610d300a64d9d053b0a411d86da730
* | | | | | | Fix 5310099: Accept an array of default values for ListPreference.Chih-Chung Chang2011-10-287-15/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason we want an array of default values is some of them may be unsupported on a hardware platform. The first supported value in the array will be used as the default value. Change-Id: I9e372304ec0eaea3181cf70c352a50b82d4b8c58
* | | | | | | Fix 5520611: Sleep after no interaction fow two minutes.Chih-Chung Chang2011-10-281-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33b38fa54302c0dbf98298e28c9457c9bf61bb7d
* | | | | | | Fix 5520606: Should be able to deselect the effect selected to clear effects.Chih-Chung Chang2011-10-281-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41ea0d23b4ec83f5205fbe1324fb997a1d0971f3
* | | | | | | Fix 5519885: correct background replacement messages.Chih-Chung Chang2011-10-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b587cd551c4b9a184fd00739519651ef7f5e92a
* | | | | | | am e7445c55: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e7445c558d6f58ef1006abf7c589ca075fdf13a4': Import revised translations. DO NOT MERGE
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-272-9/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I4891658609a8481c692c834e4942c25f08dd4232
* | | | | | Merge "Fix video capture intent preview alert for effects." into ics-mr1Eino-Ville Talvala2011-10-271-6/+22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix video capture intent preview alert for effects.Eino-Ville Talvala2011-10-251-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In effects mode, stopping video record is asynchronous, and dealing with alerts and thumbnails has to be deferred until a done callback from the effectsrecorder. Bug: 5494625 Change-Id: Ic343b672c29515cb77f62b8d3e685d668681fdd1
* | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2715-336/+336
|\ \ \ \ \ \
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2615-336/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5572ff3726c47037af6f27c7ad9975dbbee0611
* | | | | | | Make PreviewFrameLayout and ControlPanelLayout work in potrait mode.Wu-cheng Li2011-10-27178-21/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Move tablet resource to sw600dp and sw800dp bug:5446617 Change-Id: Iaf2a442e621ed071d7639972a529dd263e3ce628
* | | | | | | Fix 5514199: Update assets.Chih-Chung Chang2011-10-27150-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I563c9c6e08260cdb0d8c4b5dd0e45c17edce20af
* | | | | | | Merge "Make Panorama work in portrait layout." into ics-mr1Wu-cheng Li2011-10-265-45/+142
|\ \ \ \ \ \ \
| * | | | | | | Make Panorama work in portrait layout.Wei-Ta Chen2011-10-265-45/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the support of both portrait and landscape layout to the panorama library. Add a step into the preview renderer that rotates the content in the offscreen buffer by 90 degrees in the case of a portrait layout. Change-Id: I879e3476daac522b0c8b27fe3ef5b17ebf0797e3
* | | | | | | | Merge "Fix camera app still opens the camera in lock screen sometimes." into ↵Wu-cheng Li2011-10-261-3/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1
| * | | | | | | | Fix camera app still opens the camera in lock screen sometimes.Wu-cheng Li2011-10-261-3/+14
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose camera app is in the foreground. If users turn off and turn on the screen very fast, camera app can still have the focus when the lock screen shows up. Now the camera app will not open the camera as long as screen is locked. bug:5491362 Change-Id: Idf2a1b160c94abb889729e0525c9903b62f12dd0
* | | | | | | | Merge "Fix 5489985: Handle the exception when the external volume has not ↵Chih-Chung Chang2011-10-261-4/+10
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | been added to MediaProvider." into ics-mr1
| * | | | | | | Fix 5489985: Handle the exception when the external volume has not been ↵Chih-Chung Chang2011-10-261-4/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added to MediaProvider. Change-Id: I5bb9e59d5b1dae4c3980f624d38194fbb514d7fa
* | | | | | | am c8b09ebb: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-260-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | * commit 'c8b09ebb3a041e685eb41de3c33086e8b0611f8d': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-261-2/+2
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I25e896afcf242313ed24ae9d7a0c9c80b786820a
* | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-2647-1368/+1328
|\ \ \ \ \
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-2647-1368/+1328
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I62ffbf86b3798446c44a59457120f199b2c85a3f
* | | | | Add portrait support to effects pipeline in VideoCamera.Eino-Ville Talvala2011-10-262-1/+23
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to enable app to switch to portrait for startup speed. Still supports landscape for landscape-native devices. Bug: 5446617 Change-Id: I9853ff50d9fcd8cf53cc6e65d6c16319c1b27f76
* | | | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-255-28/+62
|\ \ \ \ | |/ / /
| * | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-241-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-10-241-2/+2
| | | | | | | | | | | | | | | | Change-Id: I1c45c8fac81d1d5fcb097c5de7dd5ad0c6d46a26