summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * Update the HDR+ assets.Sascha Haeberling2013-10-0420-0/+0
| | | | | | | | | | | | Bug: 11047147 Change-Id: I680d9a822876655d3c30715a9315a17b8db87763
* | 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
| * Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbadErin Dahlgren2013-10-031-1/+0
| |\
| | * Make space for photosphere rendering textErin Dahlgren2013-10-031-1/+0
| | | | | | | | | | | | | | | Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
* | | 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.
| * | Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-0328-15/+15
| | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
* | | 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.
| * | Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbadKevin Gabayan2013-10-035-0/+0
| |\ \
| | * | Camera2 icon update for all resolutions.Kevin Gabayan2013-10-025-0/+0
| | | | | | | | | | | | | | | | | | | | Bug: 11048341 Change-Id: I71bf09eed24aa23e30eaf8c9bf4add8c0d1835b1
* | | | 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)
| * | | Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-033-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1
* | | | am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit '3393a62797fa397823eba720b3f52d39ae065739': Add missing crop message.
| * | | Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
| |\ \ \
| | * | | Add missing crop message.Sascha Haeberling2013-10-031-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 11021907 Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
* | | | am 9ac97492: Merge "Show the delete button if there is room in action bar." ↵ztenghui2013-10-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '9ac97492cafafc02357de21074d95b29d55d2e9f': Show the delete button if there is room in action bar.
| * | | Merge "Show the delete button if there is room in action bar." into ↵ztenghui2013-10-031-1/+1
| |\ \ \ | | |/ / | |/| | | | | | gb-ub-photos-carlsbad
| | * | Show the delete button if there is room in action bar.ztenghui2013-10-021-1/+1
| | |/ | | | | | | | | | | | | | | | bug:10731828 Change-Id: I251593bcbfc8547d1bc445a56f3cd7fd3dd4acf3
* | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0355-152/+207
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0255-152/+207
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib171940890f7da47381b6f33a9dddc893cfe60d5 Auto-generated-cl: translation import
* | | | am c60e2b09: Merge "Increase char limit for camera timer sound message." ↵Sascha Haeberling2013-10-021-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | into gb-ub-photos-carlsbad * commit 'c60e2b096886e36580c6ecfedd037dcf21130ed3': Increase char limit for camera timer sound message.
| * | Merge "Increase char limit for camera timer sound message." into ↵Sascha Haeberling2013-10-021-1/+1
| |\ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | Increase char limit for camera timer sound message.Sascha Haeberling2013-10-011-1/+1
| | |/ | | | | | | | | | | | | | | | Bug: 10962439 Change-Id: Ib08734a059082dd6a20a7ded67bc3495500c598e
* | | am 72a83bc2: Merge "Add content description to post-capture thumbnail." into ↵Sascha Haeberling2013-10-013-2/+7
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '72a83bc295dfa5c0d07102065f50930bf18e28e2': Add content description to post-capture thumbnail.
| * | Add content description to post-capture thumbnail.Sascha Haeberling2013-10-013-2/+7
| |/ | | | | | | | | | | Bug: 10916138 Change-Id: I6fc5316cf622da8ba7bfcff5c6b43104d50c6652
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0155-13972/+14025
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-09-3055-13972/+14025
| | | | | | | | | | | | | | | Change-Id: I250289ddbb5e5e2a3062ee895b4ebfaf6004db8f Auto-generated-cl: translation import
* | | am 4d21fc2e: Merge "Show status bar in filmstrip mode" into ↵Sascha Haeberling2013-09-301-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | gb-ub-photos-carlsbad * commit '4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427': Show status bar in filmstrip mode
| * Show status bar in filmstrip modeSascha Haeberling2013-09-301-1/+1
| | | | | | | | | | | | | | | | | | Bug: 11005642 Also makes sure we only call setSystemUiVisibility in only one place. Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
* | am 67685a78: Add HQ icon indicator support.Sascha Haeberling2013-09-261-0/+0
|\| | | | | | | | | * commit '67685a78a29a0311043f38f8766a1fbbf881a599': Add HQ icon indicator support.