summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Build broken.Baligh Uddin2013-10-0555-253/+179
| | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit 0028336423130a5a0227cd932d3295581f83dd22. Change-Id: Id3638d0d093d03c037d30a3b1f49e242ff67af85
* Import translations. DO NOT MERGEBaligh Uddin2013-10-0455-179/+253
| | | | | Change-Id: Ie6c099841e72853be3243fffc8d6c266c8c802da Auto-generated-cl: translation import
* am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" ↵Doris Liu2013-10-031-8/+10
|\ | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit 'b0fbd5437cc67ce10e8f4b2a7318d4cc97110976': Prevent picture taking via volumn key in filmstrip mode
| * Merge "Prevent picture taking via volumn key in filmstrip mode" into ↵Doris Liu2013-10-041-8/+10
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Prevent picture taking via volumn key in filmstrip modeDoris Liu2013-10-031-8/+10
| | | | | | | | | | | | | | | Bug: 11045068 Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212
* | | am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." ↵Sascha Haeberling2013-10-031-0/+7
|\| | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '7ba4a88eb78fc41717275de25748f5cf17915f5b': Sync Camera2 permissions to GoogleCamera permissions.
| * | Merge "Sync Camera2 permissions to GoogleCamera permissions." into ↵Sascha Haeberling2013-10-031-0/+7
| |\ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | Sync Camera2 permissions to GoogleCamera permissions.Sascha Haeberling2013-10-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10951073 Excluding the Gallery3d and gservices permissions. Change-Id: If6508114a47e1a793a2b4caab81437242907f8d2
* | | | am 77dd1493: Merge "Make space for photosphere rendering text" into ↵Erin Dahlgren2013-10-032-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-2/+1
| |\ \ \
| | * | | Make space for photosphere rendering textErin Dahlgren2013-10-032-2/+1
| | |/ / | | | | | | | | | | | | | | | | Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
* | | | am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into ↵Sascha Haeberling2013-10-0333-50/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '238799e97077ee72a53a5a04d9d3068aebb82bf7': Change icons and code from HQ to HDR+ mode.
| * | | Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbadSascha Haeberling2013-10-0333-50/+45
| |\ \ \
| | * | | Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-0333-50/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
* | | | | am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into ↵Angus Kong2013-10-036-22/+227
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '5bca6f4cf43732edf459010f418d3719e07f3c8a': Don't allow actions on items in progress.
| * | | | Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbadAngus Kong2013-10-036-22/+227
| |\ \ \ \
| | * | | | Don't allow actions on items in progress.Angus Kong2013-10-036-22/+227
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | bug:11049529 Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
* | | | | am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into ↵Doris Liu2013-10-032-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '930b9b41185a2f59c05fe527300248776d3993a0': Leave ROI not set except in tap-to-focus scenario
| * | | | Merge "Leave ROI not set except in tap-to-focus scenario" into ↵Doris Liu2013-10-032-3/+6
| |\ \ \ \ | | |/ / / | |/| | | | | | | | gb-ub-photos-carlsbad
| | * | | Leave ROI not set except in tap-to-focus scenarioDoris Liu2013-10-032-3/+6
| | | |/ | | |/| | | | | | | | | | | | | Bug: 11005574 Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
* | | | 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 4c0aede4: Merge "Only show delete action when in secure camera mode." ↵ztenghui2013-10-031-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '4c0aede4ea37f8fad98a40ec4d28028f338591bd': Only show delete action when in secure camera mode.
| * | | | | Merge "Only show delete action when in secure camera mode." into ↵ztenghui2013-10-031-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | | | Only show delete action when in secure camera mode.ztenghui2013-10-021-0/+5
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | bug:11048260 Change-Id: Idcf452e91983acdfad17ce1cc503b25d17c2e53c
* | | | | | 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
* | | | | am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler ↵Mangesh Ghiware2013-10-021-3/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | found." into gb-ub-photos-carlsbad * commit '4f563f1d91b381ff840e84c52d548194517f6b4c': Exit Camera on Up button if no APP_GALLERY handler found.
| * | | | Merge "Exit Camera on Up button if no APP_GALLERY handler found." into ↵Mangesh Ghiware2013-10-031-3/+9
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | gb-ub-photos-carlsbad
| | * | | Exit Camera on Up button if no APP_GALLERY handler found.Mangesh Ghiware2013-10-021-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11047289 Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c
* | | | | 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 cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that ↵Erin Dahlgren2013-10-021-9/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad * commit 'cf7babd5cbe69cf99d96e46c306d6733837f48eb': Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
| * | | | Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere ↵Erin Dahlgren2013-10-021-9/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | viewer icon is visible." into gb-ub-photos-carlsbad
| | * | | | Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon ↵Erin Dahlgren2013-10-011-9/+17
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | is visible. Bug: 10715651 Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6
* | | | | am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbadAngus Kong2013-10-021-26/+84
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit '45f5976f2c1d4eda46be4ea591c6196c683f2ded': Make scroll animation smoother.
| * | | Merge "Make scroll animation smoother." into gb-ub-photos-carlsbadAngus Kong2013-10-021-26/+84
| |\ \ \
| | * | | Make scroll animation smoother.Angus Kong2013-10-011-26/+84
| | |/ / | | | | | | | | | | | | | | | | | | | | bug:10802703 Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4
* | | | am 706c985f: Merge "Deactivate the backup agent in Camera2" into ↵Sascha Haeberling2013-10-011-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '706c985f0a8c8d996b979543a541ed2cb41269e1': Deactivate the backup agent in Camera2
| * | | Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbadSascha Haeberling2013-10-021-1/+0
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 10:01:26 +0000