summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-27174-0/+0
| | | | | | | | | | | | | | | | + 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
* Import revised translations. DO NOT MERGEEric Fischer2011-10-2647-1368/+1328
| | | | Change-Id: I62ffbf86b3798446c44a59457120f199b2c85a3f
* Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-251-2/+2
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-241-2/+2
| | | | | | | | Change-Id: I1c45c8fac81d1d5fcb097c5de7dd5ad0c6d46a26
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-211-2/+2
| | | | | | | | Change-Id: Ia2df1b49bd67037cc12447a20836d9518bd9e77f
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-201-2/+2
| | | | | | | | Change-Id: I0545b3e482f37103e481d17fe9b1659588199406
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-2015-106/+66
| | | | | | | | Change-Id: I32dcc32120f29295528289e2d2523cc6d53290a9
* | String scrub to bring to punc, wording, etc standards.Claudia de Veaux2011-10-201-27/+27
|/ | | | | | Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Change-Id: I4fd05be0fefa214cebdcc390d699691752fa17aa
* bugfix 5479807 Video preview displaced to right when orientation changedMark Wagner2011-10-191-7/+15
| | | | | | | | | | | | | Three changes: (1) center the play button over the thumbnail (2) leverage the existing mechanism for scaling the image for video thumbnails which want to be 4/3 (3) use center_crop for video previews so that they properly align in the ui. Not doing so means we were getting black bars at the top and bottom which was wrong. Change-Id: Ifc416455d03136a393239487db07493dc27f151e
* Merge "Add timelapse recording support to effects mode." into ics-mr0Pannag Sanketi2011-10-182-6/+4
|\
| * Add timelapse recording support to effects mode.Eino-Ville Talvala2011-10-182-6/+4
| | | | | | | | | | | | Bug: 5452088 Change-Id: I87c69e715ccdd6c48f18ecaa1fb4f362e2a9d567
* | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-1847-93/+694
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-1847-93/+694
| |/ | | | | | | Change-Id: I6156a2fc099446b0b7fb4511362098df75bda30d
* | Fix 5454202: make the UI work even if there is no goofy face effect.Chih-Chung Chang2011-10-181-1/+2
|/ | | | Change-Id: I6e498dac31538a1af57e2c79d5df3519f2ab57da
* Bug 5383077: handle video thumbnail generation correctly when effects are onRodrigo Carceroni2011-10-142-0/+4
| | | | Change-Id: I94d63c99dd8b8a488f5c8d660c592bc34d1b7360
* New shutter retake assetsEvan Millar2011-10-123-0/+0
| | | | | bug:5393144 Change-Id: I5a082c03a2eb887d162f4a55314e74813ccc6954
* Update tablet layouts to go along with change 141368Evan Millar2011-10-122-16/+10
| | | | | bug:5449552 Change-Id: I047577bd4903a23f64e4b7f875dcbbbced8a0866
* More bg training polish.Evan Millar2011-10-116-38/+66
| | | | | | | | | | | | Make training modal by placing a semi-transparent view behind the message panel to prevent interaction with the rest of the camera UI. Use the framework dialog asset as the background asset for the message panel. Since this asset is not public I had to copy it into the Camera package. bug:5225962 Change-Id: Ief97f545c6c0bb3695a056481d5e6d56d44edf25
* [DO NOT MERGE] Add orientation switching and cancel button to bg training panel.Evan Millar2011-10-111-7/+30
| | | | | | | | -I also changed some calls to GridView.ClearChoices() to explicit setItemChecked(..., false) calls because of bug 5439410. bug:5225962 Change-Id: Ie764a209bc9647db8522efd38609c8ed383b5d0b
* Merge "Change the border of video snapshot from transparent to black."Wu-cheng Li2011-10-111-1/+1
|\
| * Change the border of video snapshot from transparent to black.Wu-cheng Li2011-10-111-1/+1
| | | | | | | | | | bug:5441209 Change-Id: Ifc79d98d092ea7c938edd4fea70d59b15c5e050a
* | Camera UI: selected status color for settings.Chung-yih Wang2011-10-113-1/+1
| | | | | | | | | | bug: 5386702 Change-Id: I44af8ff13f080e1260d711a76a86124e639983c4
* | Add content descirptions for accessibility.Chung-yih Wang2011-10-115-0/+41
| | | | | | | | | | | | bug:5230109 Change-Id: I055fccea0d30c54dc8520bf1d0424b963d2ba8a5
* | Merge "bugfix 5290450 Share UI should match redlines"Mark Wagner2011-10-107-2/+23
|\ \
| * | bugfix 5290450 Share UI should match redlinesMark Wagner2011-10-107-2/+23
| |/ | | | | | | | | | | | | | | Add the "go to gallery" button at the top of the list of share choices. Made it a separate button rather than part of the list since it gets it's own separator. Change-Id: I62f866f7aedd3e84916eccf037f3fa37a8528196
* | Merge "Import revised translations."Eric Fischer2011-10-1046-10/+99
|\ \ | |/ |/|
| * Import revised translations.Eric Fischer2011-10-0746-10/+99
| | | | | | | | Change-Id: I3e5b2c9717f743876995eb10c1a9efc18964313f
* | bugfix 5429969 camera goofy faces assets updateMark Wagner2011-10-0718-0/+0
| | | | | | | | Change-Id: I92c23c7623a38480cda8109fb209973fc876906a
* | Merge "bugfix 5290450 Share UI should match redlines"Mark Wagner2011-10-072-11/+4
|\ \ | |/ |/|
| * bugfix 5290450 Share UI should match redlinesMark Wagner2011-10-072-11/+4
| | | | | | | | | | | | | | Incremental work towards matching the redline. This will probably require a review pass from UX to catch any missed items. Change-Id: I0496aa0fc1941f8ffa06050ae8fbed3fe7246878
* | Merge "Let review icons rotatable."Chih-yu Huang2011-10-075-28/+47
|\ \
| * | Let review icons rotatable.Chih-yu Huang2011-10-075-28/+47
| |/ | | | | | | | | bug:5244256 Change-Id: Ieed6119f22598a34eeb1672d07f55a876dced791
* | Fix the margin and padding of the setting popup.Chung-yih Wang2011-10-075-7/+8
|/ | | | | bug:5386702 Change-Id: I4883937b5f0e374d29cee8135d2051628714ed3d
* Fix indicator bar being clipped by black background.Eino-Ville Talvala2011-10-061-3/+6
| | | | | | | | Change listing order of indicator bar and background for correct Z-ordering. Bug: 5422809 Change-Id: Id4963de2677230791102866688128afffc062d03
* Merge "Properly mirror video for front camera effects recording."Eino-Ville Talvala2011-10-062-2/+4
|\
| * Properly mirror video for front camera effects recording.Eino-Ville Talvala2011-10-052-2/+4
| | | | | | | | | | | | | | | | | | | | - Incoming transform from camera SurfaceTexture is mirrored for front camera - Recording preview needs to be mirrored, but the recorded video needs to be unmirrored. Bug: 5408479 Change-Id: I0cdb29151ae20b02f690fb976e5a29e594c094a1
* | Merge "Change focus sound."Wu-cheng Li2011-10-061-0/+0
|\ \
| * | Change focus sound.Wu-cheng Li2011-10-061-0/+0
| |/ | | | | | | | | | | bug:5401870 Change-Id: Ifb5c61ad52489c0b8fb711ba6ada624f20f0e880
* | Show a toast while taking a video snapshot with effects on.Wei-Ta Chen2011-10-051-0/+3
|/ | | | | | | | Show a toast when a user tries to take a video snapshot while the effects are on. Bug: 5350124 Change-Id: I09092e01a0864db7e48d94e09dc643d17f6b7528
* Merge "Add time lapse label for Phone UI."Wei Huang2011-10-058-39/+53
|\
| * Add time lapse label for Phone UI.Angus Kong2011-10-058-39/+53
| | | | | | | | | | | | | | | | | | 1. The behavior on tablet UI and phone UI now is the same. 2. The recording time and time lapse label now always stay on the top-left corner (even when in portrait). bug:5394916 Change-Id: Ifa5013748dbdda3a6c0083569ec3c565b4c687eb
* | Merge "bugfix 5370554 camcorder preview background is inconsistent"Mark Wagner2011-10-051-0/+8
|\ \
| * | bugfix 5370554 camcorder preview background is inconsistentMark Wagner2011-10-041-0/+8
| |/ | | | | | | Change-Id: Iac812d08a446cc496b9c0162422c83720cc3ba04
* | Rearrange the second level indicator set.Chung-yih Wang2011-10-051-0/+8
| | | | | | | | | | | | | | | | | | bug:5360827 +change the icon spacing to 16dp +Store the geodata in the video. Change-Id: I133871066b6b9a8918f861f0510e3996d5b0f839
* | Add support for rotating background video based on device orientation.Eino-Ville Talvala2011-10-032-0/+7
|/ | | | | Bug: 5355973 Change-Id: I5c0145a717c22b9423341988b90c4962ad333337
* Merge "Fix recording time label in portrait mode."Angus Kong2011-10-033-27/+38
|\
| * Fix recording time label in portrait mode.Angus Kong2011-10-033-27/+38
| | | | | | | | | | bug:5039042 Change-Id: I61dd597b0b71566a00eb1cca45ea0b3e3019fac6