summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Add GCam progress indicator.Sascha Haeberling2013-11-071-0/+2
| | | | | | Bug: 11505806 Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
* Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbadztenghui2013-11-061-0/+2
|\
| * Fix the RTL layout in the app's manifest.ztenghui2013-11-051-0/+2
| | | | | | | | | | | | | | At the same time, make sure the bottom controls are following RTL rules. bug:11481090 Change-Id: I52262aece7c16c194b6419150c1d4c13abff4f2d
* | add 'capturing' string for in process indicatorsAlan Newberger2013-11-051-0/+3
|/ | | | | | | This string can be used for in progess screen indicators. Bug: 11505806 Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
* Merge "adjust keyguard camera layout to make buttons match" into ↵Alan Newberger2013-11-041-3/+3
|\ | | | | | | gb-ub-photos-carlsbad
| * adjust keyguard camera layout to make buttons matchAlan Newberger2013-10-151-3/+3
| | | | | | | | | | | | | | | | by trial and error adjusted the bottom margins of the controls to make transition to real camera layout seamless on the HH and N4. Bug: 11236276 Change-Id: I707a5b0b94ac466c07b19c84473e444250cecf28
* | Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbadAlan Newberger2013-11-041-4/+4
|\ \
| * | Adjust HDR options menu detailsAlan Newberger2013-11-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | To better align HDR/HDR+ menu options with other menu options, shortening the description and making it all caps. Bug: 11481286 Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8
* | | Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbadAlan Newberger2013-11-012-0/+12
|\ \ \
| * | | Add Samsung front camera resolutionsMichael Kolb2013-11-012-0/+12
| |/ / | | | | | | | | | | | | | | | | | | Bug: 11462711 Bug: 9275928 Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
* / / Add new notification icon.Sascha Haeberling2013-11-014-0/+0
|/ / | | | | | | | | | | Bug: 11417480 Change-Id: I072a1348d515b2cd435748e2db2824e98a604413
* | gcam: Add placeholder image.Ruben Brunk2013-10-281-0/+29
| | | | | | | | | | | | Bug: 11050749 Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
* | Update HDR/HDR+ arc menu hover messages.Sascha Haeberling2013-10-171-4/+4
| | | | | | | | | | | | Bug : 11185194 Change-Id: Ie26e9a225dffa0a8ccd9e99fff3d7264b079ac62
* | Merge "Show a preview cover until real preview is ready" into ↵Doris Liu2013-10-173-0/+18
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Show a preview cover until real preview is readyDoris Liu2013-10-153-0/+18
| | | | | | | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-10-1755-444/+224
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-1755-444/+224
| |/ / | | | | | | | | | | | | Change-Id: Ie510117ceb7dacad642d2fb87c81aa3aa0ff3e89 Auto-generated-cl: translation import
* / / update camera launcher iconAri Sachter-Zeltzer2013-10-165-0/+0
|/ / | | | | | | | | | | fixed b/11252230 Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227
* | Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbadIgor Murashkin2013-10-1559-11940/+15663
|\ \
| * | 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
| * | 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.
| * \ \ 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
| * \ \ \ 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
| * | | | | 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
| * \ \ \ \ \ 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
| * | | | | | | 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.
| * \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ 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 "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.
| * | | | | | | | | | | 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.
| * | | | | | | | | | | | am 77dd1493: Merge "Make space for photosphere rendering text" into ↵Erin Dahlgren2013-10-031-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '77dd14930b24816369560a73cfb0610c1f745d05': Make space for photosphere rendering text
| * \ \ \ \ \ \ \ \ \ \ \ \ am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into ↵Sascha Haeberling2013-10-0328-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '238799e97077ee72a53a5a04d9d3068aebb82bf7': Change icons and code from HQ to HDR+ mode.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 68fc363b: Merge "Camera2 icon update for all resolutions." into ↵Kevin Gabayan2013-10-035-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '68fc363bd33a9e506ccfd1ffa330c4525a2734ce': Camera2 icon update for all resolutions.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 623b74b6: Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-033-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '623b74b608fae83034bab58331fc705b8cfecaa6': Add HDR+ mode strings (to replace HQ mode)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 09:05:42 +0000