summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9ac97492: Merge "Show the delete button if there is room in action bar." i...ztenghui2013-10-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0355-152/+207
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0255-152/+207
| * | | | | | | | | | | | | | | | | | | am c60e2b09: Merge "Increase char limit for camera timer sound message." into...Sascha Haeberling2013-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 72a83bc2: Merge "Add content description to post-capture thumbnail." into ...Sascha Haeberling2013-10-013-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0155-13972/+14025
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-3055-13972/+14025
| * | | | | | | | | | | | | | | | | | | | | am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carl...Sascha Haeberling2013-09-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 67685a78: Add HQ icon indicator support.Sascha Haeberling2013-09-261-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 22236064: Merge "Use Camcorder label and icon for video camera activity." ...Mangesh Ghiware2013-09-263-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2555-58/+168
| * | | | | | | | | | | | | | | | | | | | | | | am 98f38bb0: Add HQ option and use it to switch to GCam.Sascha Haeberling2013-09-257-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-I...Kevin Gabayan2013-09-24175-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-2455-20/+130
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2355-20/+130
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 29e7a34e: De-blue cameraMindy Pereira2013-09-2418-0/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-p...Doris Liu2013-09-2410-242/+194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-...Kevin Gabayan2013-09-231-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1955-26/+138
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1955-26/+138
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbadRuben Brunk2013-09-191-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 19ab725a: Add crop activitynicolasroard2013-09-197-0/+133
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-car...Ruben Brunk2013-09-192-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-ph...Mangesh Ghiware2013-09-183-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b2d70d5b: Fix various message issuesSascha Haeberling2013-09-181-13/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1741-330/+166
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1641-330/+166
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3d91d906: Add HQ and HD strings.Sascha Haeberling2013-09-161-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1455-0/+384
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a5a08d76: Bring back tiny planet to the Camera filmstripSascha Haeberling2013-09-122-0/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-122-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-112-13/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 36e56fba: Show captured image rather than frozen preview for capture intentDoris Liu2013-09-111-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-0960-10943/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cd7b8c13: Re-add a strings that should not have cleaned up.Sascha Haeberling2013-09-061-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 46c09ba0: Remove unused strings.Sascha Haeberling2013-09-051-480/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-0514-132/+132
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbadAngus Kong2013-09-0415-17/+378
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5633994e: Increase char limit.Sascha Haeberling2013-09-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 33035c19: Bring back \'share 360 photosphere\' to filmstripMangesh Ghiware2013-09-041-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-0360-17090/+24975
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1d9a8d7a: Rename renering message from panorama to photo sphere.Sascha Haeberling2013-08-302-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating shutter button resourcesSascha Haeberling2013-10-1464-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating button assets, follow-up to http://ag/373177Sascha Haeberling2013-10-1410-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix SRI upside down preview in reverse landscape and reverse portraitDoris Liu2013-10-141-3/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change keyguard camera layout to show no menu options in indicatorAlan Newberger2013-10-131-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add 'disabled' state for when Gcam is unable to take another shot." in...Sascha Haeberling2013-10-1325-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'disabled' state for when Gcam is unable to take another shot.Sascha Haeberling2013-10-1325-0/+21
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for mis-placed camera controlsDoris Liu2013-10-132-19/+0
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /