summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-10-174-10/+10
| | | | | Change-Id: I50a68a5ff367a08ae06bd84c83e1035b9fb0bdd5 Auto-generated-cl: translation import
* am d8b555b8: Merge "Updating shutter button resources" into ↵Sascha Haeberling2013-10-1464-0/+0
|\ | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'd8b555b801c5e57bfbeca27ef38bea7688286c3c': Updating shutter button resources
| * Updating shutter button resourcesSascha Haeberling2013-10-1464-0/+0
| | | | | | | | | | | | Bug: 11155984 Change-Id: I178938250d2f99e32c9c339f3ffdf4495c053361
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-1455-442/+222
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-10-1455-442/+222
| | | | | | | | | | | | | | | Change-Id: I80c7902d8de92127a13f6d2f66452c876090a7ac Auto-generated-cl: translation import
* | | am 2670f3e4: Updating button assets, follow-up to http://ag/373177Sascha Haeberling2013-10-1410-0/+0
|\ \ \ | | |/ | |/| | | | | | | * commit '2670f3e45f5818f7c1074b10ef336df30af74583': Updating button assets, follow-up to http://ag/373177
| * | Updating button assets, follow-up to http://ag/373177Sascha Haeberling2013-10-1410-0/+0
| | | | | | | | | | | | | | | | | | Bug: 11155984 Change-Id: Ib1cbf5cf53f30e45751804f6d9d25afa127df99a
* | | am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and ↵Doris Liu2013-10-141-3/+2
|\| | | |/ |/| | | | | | | | | reverse portrait" into gb-ub-photos-carlsbad * commit 'ce75de57dca5398b7786ad7262cb016e5f6b24ee': Fix SRI upside down preview in reverse landscape and reverse portrait
| * Fix SRI upside down preview in reverse landscape and reverse portraitDoris Liu2013-10-141-3/+2
| | | | | | | | | | | | | | | | | | Also make sure preview is not upside down after device flip, and fix camera controls jiggering during rotation Bug: 11216647 Bug: 11174540 Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
* | am 28019abc: Change keyguard camera layout to show no menu options in indicatorAlan Newberger2013-10-131-2/+2
|\| | | | | | | | | * commit '28019abc86de3d96a32595e69f6c549353b2c4ec': Change keyguard camera layout to show no menu options in indicator
| * Change keyguard camera layout to show no menu options in indicatorAlan Newberger2013-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | There are situations where the user selected options e.g. hdr+ are the initial indicators to the camera, so showing autoflash on the fake layout seems janky. additionally I sometimes see camera showing its own default clean circle indicator layout prior to switching to whatever indicators are active. For both these reasons it seems better to start secure camera from lockscreen with an empty circle indicator. I tried this CL out on my device and can confirm it feels less janky. Bug: 11206325 Change-Id: Ia694a21e5c86f9e12a339679aa30f4b21f1fa23b
* | am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take ↵Sascha Haeberling2013-10-1325-0/+21
|\| | | | | | | | | | | | | another shot." into gb-ub-photos-carlsbad * commit '704530edd94ba9b5990a247d4156ec18bf6ea0eb': Add 'disabled' state for when Gcam is unable to take another shot.
| * Merge "Add 'disabled' state for when Gcam is unable to take another shot." ↵Sascha Haeberling2013-10-1325-0/+21
| |\ | | | | | | | | | into gb-ub-photos-carlsbad
| | * Add 'disabled' state for when Gcam is unable to take another shot.Sascha Haeberling2013-10-1325-0/+21
| | | | | | | | | | | | | | | | | | Bug: 11113201 Change-Id: I887104dc79f4a7a83bb79b2d30c0289fc90c9022
* | | am c937ab7f: Merge "Fix for mis-placed camera controls" into ↵Doris Liu2013-10-132-19/+0
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'c937ab7f9bac633aa425da62348f9eb07c248450': Fix for mis-placed camera controls
| * | Fix for mis-placed camera controlsDoris Liu2013-10-132-19/+0
| |/ | | | | | | | | Bug: 11205682 Change-Id: Ie74e906a059158db825977af898445b2b2ba5a48
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-1255-0/+495
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-10-1255-0/+495
| | | | | | | | | | | | | | | Change-Id: I4ff93327a41e4a0c3263e3fb32b510b19f60ab8c Auto-generated-cl: translation import
* | | am a5002410: Merge "Correct initial orientation of camera controls" into ↵Doris Liu2013-10-122-0/+19
|\ \ \ | |/ / |/| / | |/ | | | | | | gb-ub-photos-carlsbad * commit 'a500241084f9e267e5f154b55e7a76a09623e6d8': Correct initial orientation of camera controls
| * Correct initial orientation of camera controlsDoris Liu2013-10-112-0/+19
| | | | | | | | | | Bug: 8878379 Change-Id: I3ecf190b19e91ae963e67ae2930b7388c4f92c70
* | am 87d093d6: Merge "Bring full screen window flag back to camera" into ↵Doris Liu2013-10-111-1/+1
|\| | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '87d093d6145524b1c8f5c052dfe40c18b52e5235': Bring full screen window flag back to camera
| * Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbadDoris Liu2013-10-121-1/+1
| |\
| | * Bring full screen window flag back to cameraDoris Liu2013-10-111-1/+1
| | | | | | | | | | | | | | | Bug: 11027091 Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
* | | am c13cc22b: Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
|\| | | | | | | | | | | | | | * commit 'c13cc22ba17591111be3fae732ae0396e889820a': Add strings to better describe HDR mode menus
| * | Add strings to better describe HDR mode menusAlan Newberger2013-10-111-0/+8
| |/ | | | | | | | | | | | | | | Instead of one word, these strings will describe the button action i.e. 'Turn HDR on'. Leaving existing strings to pipeline translations before implementing the migration to these strings. Bug: 11185194 Change-Id: Ie9aca0b328b19c610af740127e1683a8d87f93d8
* | Fix build break.Sameer Padala2013-10-1149-4609/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ag/369626/ added a cannot_load_image string which was translated in ag/370960/ However, this translation resulted in a duplicate string since this string already existed in translated versions of filtershow_strings.xml which was deleted in ag/339346 but the translated versions weren't deleted. Deleting all the translated versions of that file caused a problem because ag/362583/ added source code that depended on a setting_wallpaper string which only existed in the translated string files. This change deletes the translated filtershow_strings.xml and adds the untranslated setting_wallpaper string. Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934 (cherry picked from commit 73a18da0f6181d882d04d648ddcbcc82047f5d71)
* | Revert "Revert "Import translations. DO NOT MERGE""Baligh Uddin2013-10-1155-179/+179
| | | | | | | | | | | | This reverts commit faa0615fd6d67fdfdbf28df099cb40a02c34c2f0. Change-Id: I8043d94a45a975412c6f73e64628e1af3cc4d8fe
* | Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-1155-179/+179
| | | | | | | | | | | | This reverts commit 69e938dd6c3e49bfda29fc665b44340bf35b3e09. Change-Id: I8a37595707a87b950c36a25003726d052ba2ab9d
* | Import translations. DO NOT MERGEBaligh Uddin2013-10-1155-179/+179
| | | | | | | | | | Change-Id: Ib699ef5577f778618a8657f9f58d317def9268ab Auto-generated-cl: translation import
* | am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbadMindy Pereira2013-10-1020-0/+0
|\| | | | | | | | | * commit '47e437dea0d53310eba230a54724b30004de144f': Update shutter recording assets.
| * Update shutter recording assets.Mindy Pereira2013-10-0920-0/+0
| | | | | | | | | | | | fixes b/11155984 SRI pano shutter button inconsistent Change-Id: I6b4c8419d4cd3814287edf932dcdfcc8b91e49e6
* | am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" ↵Doris Liu2013-10-091-0/+1
|\| | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit 'ef4dccf65c1077b8c7f28c26c9c2038c975fd94c': Workaround to disable swiping for SRI during capture
| * Workaround to disable swiping for SRI during captureDoris Liu2013-10-091-0/+1
| | | | | | | | | | Bug: 11139101 Change-Id: I2cfc9fb94259755e3db6f5d0b80287388cb846de
* | am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into ↵Mindy DelliCarpini2013-10-0852-0/+0
|\| | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '2ca6c0f77ab8c70558e2ad4937d2fdd1e505b0f5': Update camera assets for de-blue effort
| * Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbadMindy DelliCarpini2013-10-0852-0/+0
| |\
| | * Update camera assets for de-blue effortMindy DelliCarpini2013-10-0452-0/+0
| | | | | | | | | | | | | | | | | | Fixes b/11007065 Shutter button disappears / becomes white when pressed Change-Id: I4001df821e545317eb4436da21f8f8d255d330f3
* | | Merge "Revert "Import translations. DO NOT MERGE"" into klp-devBaligh Uddin2013-10-0855-179/+179
|\ \ \
| * | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2013-10-0855-179/+179
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5d00bc10562d86312bc88c34d00da20f41cc3ad9. Change-Id: I82e49f95a3e0705a506cbb409130b19a63e582c1
* | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0855-179/+179
|\| | |
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0755-179/+179
| | | | | | | | | | | | | | | | | | | | Change-Id: I6a24d5d07950f17fe0886365c359ea1514df7c07 Auto-generated-cl: translation import
* | | | am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbadSascha Haeberling2013-10-071-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '94f5f216821c1090bd8a0660483935456dc13df1': Increase character limit.
| * | Increase character limit.Sascha Haeberling2013-10-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 10999205 Bug: 10558260 Bug: 10554875 Change-Id: Ib2add1a1b32a4a1a677d30a4bd11b0de5f6f126b
| * | Fix missing filtershow string. DO NOT MERGESascha Haeberling2013-10-0749-4608/+3
| |/ | | | | | | | | | | Bug: 11116778 Change-Id: I459e0b1db241a38866a3b06be5b316dc3b300c56
* | Revert "Remove translated filtershow_strings.xml files."Baligh Uddin2013-10-0750-0/+4672
| | | | | | | | | | | | This reverts commit b17ba7b90fc7ad2d4a12ba5bf86a0b0bd04c6900. Change-Id: Ib5bc636f29af4dee5c4bca520fb3d183187a1b7a
* | Remove translated filtershow_strings.xml files.Baligh Uddin2013-10-0450-4672/+0
| |
* | Merge "Build broken." into klp-devBaligh Uddin2013-10-0555-253/+179
|\ \
| * | Build broken.Baligh Uddin2013-10-0555-253/+179
| | | | | | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit 0028336423130a5a0227cd932d3295581f83dd22. Change-Id: Id3638d0d093d03c037d30a3b1f49e242ff67af85
* | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0555-179/+253
|\| |
| * | Import translations. DO NOT MERGEBaligh Uddin2013-10-0455-179/+253
| | | | | | | | | | | | | | | Change-Id: Ie6c099841e72853be3243fffc8d6c266c8c802da Auto-generated-cl: translation import
* | | am 18709218: Update the HDR+ assets.Sascha Haeberling2013-10-0420-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '187092180b3af64b5d7c2197d1054a860f7cbf45': Update the HDR+ assets.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 15:52:30 +0000