summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 53f24f0f: forced fx bitmaps to load unscaledJohn Hoford2012-10-101-1/+3
|\| | | | | | | | | | | | | | * commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f': forced fx bitmaps to load unscaled
| * | forced fx bitmaps to load unscaledJohn Hoford2012-10-101-1/+3
| | | | | | | | | | | | | | | bug:7327105 Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
* | | am f8044659: Merge "add White balance & disable UI elements" into ↵John Hoford2012-10-103-11/+38
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'f8044659db592f49e6e77c8a1d595955f9d206cb': add White balance & disable UI elements
| * | Merge "add White balance & disable UI elements" into gb-ub-photos-archesJohn Hoford2012-10-103-11/+38
| |\ \ | | |/ | |/|
| | * add White balance & disable UI elementsJohn Hoford2012-10-103-11/+38
| | | | | | | | | | | | | | | bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
* | | am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into ↵Mangesh Ghiware2012-10-102-2/+4
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '9b900e0d23a1a9c5b708424efe1a01b107bf774f': Disable in-place crop for 360 panorama
| * | Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-archesMangesh Ghiware2012-10-102-2/+4
| |\ \ | | |/ | |/|
| | * Disable in-place crop for 360 panoramaMangesh Ghiware2012-10-102-2/+4
| | | | | | | | | | | | | | | Bug: 7281479 Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
* | | am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into ↵Bobby Georgescu2012-10-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b': Fix missing camera thumbnail in filmstrip
| * | Fix missing camera thumbnail in filmstripBobby Georgescu2012-10-101-0/+1
| |/ | | | | | | | | Bug: 7319894 Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6
* | am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-archesGeorge Mount2012-10-109-97/+125
|\| | | | | | | | | | | * commit '21832eb7fba76cd101ad5ef7b131292aa24f3864': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
| * Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-archesGeorge Mount2012-10-109-97/+125
| |\ | | | | | | | | | | | | | | | * changes: Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
| | * Change how stitched images are inserted into Gallery.George Mount2012-10-108-112/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7299396 Stitching images now use normal LocalImages for their MediaItem instead of LightCycleItems. They are no longer part of a special album. Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
| | * Move panorama stitch progress outside the image.George Mount2012-10-102-4/+109
| | | | | | | | | | | | | | | | | | Bug 7302513 Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
* | | am eece6da4: Support REVERSE in lockOrientationJohn Reck2012-10-101-2/+8
|\| | | | | | | | | | | | | | * commit 'eece6da4d344f7e1e937130c0d36cef8ef9dbe0c': Support REVERSE in lockOrientation
| * | Support REVERSE in lockOrientationJohn Reck2012-10-101-2/+8
| | | | | | | | | | | | | | | | | | Bug: 7314703 Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
* | | am 866ed7ab: Fix inverted panorama previewJohn Reck2012-10-101-0/+4
|\| | | | | | | | | | | | | | * commit '866ed7abd7960efc7986a3624414a730e17f33a6': Fix inverted panorama preview
| * | Fix inverted panorama previewJohn Reck2012-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7314703 Panorama only support rotations of 0 and 90, so if it is greater than that flip the output surface texture Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b
* | | am 1b72a2f1: small fix to red eye codeJohn Hoford2012-10-091-1/+2
|\| | | | | | | | | | | | | | * commit '1b72a2f1124610b8050dbbdff9f1bb548199fd2e': small fix to red eye code
| * | small fix to red eye codeJohn Hoford2012-10-091-1/+2
| |/ | | | | | | | | bug:7234321 Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292
* | am 08458dc6: Latest UInicolasroard2012-10-0914-35/+221
|\| | | | | | | | | * commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d': Latest UI
| * Latest UInicolasroard2012-10-0914-35/+221
| | | | | | | | | | | | | | | | | | bug:7233983 bug:7233980 Also fixes border scaling issues. Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
* | am 457e88cd: add filtersJohn Hoford2012-10-093-1/+107
|\| | | | | | | | | * commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad': add filters
| * add filtersJohn Hoford2012-10-093-1/+107
| | | | | | | | | | bug:7234321 Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
* | am d78c5734: Merge "Correct stale background on completely empty gallery" ↵Bobby Georgescu2012-10-091-0/+1
|\| | | | | | | | | | | | | into gb-ub-photos-arches * commit 'd78c5734346cabc2577a5b9100f0f943c381ee47': Correct stale background on completely empty gallery
| * Merge "Correct stale background on completely empty gallery" into ↵Bobby Georgescu2012-10-091-0/+1
| |\ | | | | | | | | | gb-ub-photos-arches
| | * Correct stale background on completely empty galleryBobby Georgescu2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7314560 When the last album is delete by long pressing and pressing the delete icon, and the gallery is left completely empty, the slotview was not being correctly invalidated. Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d
* | | am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into ↵Bobby Georgescu2012-10-091-13/+14
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '501bd1bff5189542612929b2428b7a69abc575a6': Update design for grid/filmstrip switcher
| * | Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-archesBobby Georgescu2012-10-091-13/+14
| |\ \
| | * | Update design for grid/filmstrip switcherBobby Georgescu2012-10-091-13/+14
| | |/ | | | | | | | | | | | | Bug: 7317501 Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
* | | am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into ↵Bobby Georgescu2012-10-091-3/+2
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '3d81fdfd5916747b237229a2515152daf639447a': Fix lack of snapback on very short scroll
| * | Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-archesBobby Georgescu2012-10-091-3/+2
| |\ \
| | * | Fix lack of snapback on very short scrollBobby Georgescu2012-10-091-3/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7318609 snapToNeighborImage returns false if it didn't actually need to move to a neighboring image, so use this information to correctly snapback if needed. Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
* | | am bd14e827: Merge "Implementing Geometry save operations." into ↵Ruben Brunk2012-10-091-5/+14
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0': Implementing Geometry save operations.
| * | Merge "Implementing Geometry save operations." into gb-ub-photos-archesRuben Brunk2012-10-091-5/+14
| |\ \
| | * | Implementing Geometry save operations.Ruben Brunk2012-10-091-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7224232 Bug: 7218935 Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
* | | | am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into ↵Bobby Georgescu2012-10-092-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'd490f1aa851db853b9865a380abd01c67605d58b': Dejank camera roll scrolling in grid view.
| * | | Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-archesBobby Georgescu2012-10-092-5/+3
| |\ \ \
| | * | | Dejank camera roll scrolling in grid view.Pin Ting2012-10-092-5/+3
| | |/ / | | | | | | | | | | | | | | | | Bug:7302644 Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45
* | | | am 6e733b74: Fix share crash after closing photo editorBobby Georgescu2012-10-091-0/+16
|\| | | | | | | | | | | | | | | | | | | * commit '6e733b74465ad6994c23d624fd8ee9b7c249e7b3': Fix share crash after closing photo editor
| * | | Fix share crash after closing photo editorBobby Georgescu2012-10-091-0/+16
| | |/ | |/| | | | | | | | | | Bug: 7306707 Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
* | | am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-archesnicolasroard2012-10-094-48/+142
|\| | | | | | | | | | | | | | * commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72': Add procedural borders
| * | Merge "Add procedural borders" into gb-ub-photos-archesnicolasroard2012-10-094-48/+142
| |\ \
| | * | Add procedural bordersnicolasroard2012-10-084-48/+142
| | |/ | | | | | | | | | | | | bug:7233980 Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
* | | am 2c83c5f0: Handle stitching progress in secure album.Wu-cheng Li2012-10-093-28/+58
|\| | | | | | | | | | | | | | * commit '2c83c5f09aa79d81ee11da517fd62222f8c3337d': Handle stitching progress in secure album.
| * | Handle stitching progress in secure album.Wu-cheng Li2012-10-093-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In secure album, show stitching progress only if it is captured after the device is locked. - Make sure image capture intent does not show stitching progress. bug:7285105 Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb
* | | am 71ce96fc: Fix sharing as photo option for 360 degree panoramaMangesh Ghiware2012-10-092-25/+28
|\| | | | | | | | | | | | | | * commit '71ce96fc79787dedac56af75385dc227d52be3af': Fix sharing as photo option for 360 degree panorama
| * | Fix sharing as photo option for 360 degree panoramaMangesh Ghiware2012-10-092-25/+28
| |/ | | | | | | | | | | | | | | | | Bug: 7310190 Bug: 7302023 Also, fix disappearing sharing menu item in action bar. Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07
* | am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-archesBobby Georgescu2012-10-081-3/+2
|\| | | | | | | | | * commit '3a1279f11ec88e62a75303469b886f1cb9d50c30': Start Camera album in grid mode
| * Merge "Start Camera album in grid mode" into gb-ub-photos-archesBobby Georgescu2012-10-081-3/+2
| |\