summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
Commit message (Collapse)AuthorAgeFilesLines
* am ea5df36a: layouts, image icons, and layer behavourJohn Hoford2012-10-113-1/+158
|\ | | | | | | | | * commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5': layouts, image icons, and layer behavour
| * layouts, image icons, and layer behavourJohn Hoford2012-10-113-1/+158
| | | | | | | | | | bug:7328726 Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
* | am 7d161351: Adjust text on Apply buttonBart Sears2012-10-111-2/+2
|\| | | | | | | | | * commit '7d161351c5aac3f88eb61003d56f30275ad4a180': Adjust text on Apply button
| * Adjust text on Apply buttonBart Sears2012-10-111-2/+2
| | | | | | | | | | | | | | | | ALL CAPS was a bit loud, so go back to mixed case, lower font size to 18dip, and remove ":". Bug: 7333492 Change-Id: I18885808437e6328ec94c40df25ea0678d381825
* | am 8e1536da: Add new bordersnicolasroard2012-10-112-5/+5
|\| | | | | | | | | * commit '8e1536da92f155731d5fd729ec5b2bf00709091a': Add new borders
| * Add new bordersnicolasroard2012-10-112-5/+5
| | | | | | | | | | bug:7233749 Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
* | am e533f659: Fixes Rotate, Flip, Straighten tools.nicolasroard2012-10-1112-511/+311
|\| | | | | | | | | * commit 'e533f65961ed601ded1803caeab6cef0a778d2f2': Fixes Rotate, Flip, Straighten tools.
| * Fixes Rotate, Flip, Straighten tools.nicolasroard2012-10-1112-511/+311
| | | | | | | | | | | | | | bug:7314849 Bug:7224232 Bug:7218935 Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
* | Merge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryceHung-ying Tyan2012-10-111-2/+12
|\ \
| * | Use exiftool as ground truth for Exif API testEarl Ou2012-10-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | The ground truth XML file was generated by parsing the output from Phil Harvey's exiftool. Then we can test photos from 5000+ different camera provided by exiftool's website. Change-Id: Ida2c0409929be450a3cbb4331504aadb41138bea
* | | am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into ↵Ruben Brunk2012-10-111-18/+33
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-arches * commit '11a21df4be6984a180e27b9915a9d6af7e7ef359': Fixed apply bar text. Moved strings to xml.
| * | Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-archesRuben Brunk2012-10-111-18/+33
| |\ \
| | * | Fixed apply bar text. Moved strings to xml.Ruben Brunk2012-10-111-18/+33
| | | | | | | | | | | | | | | | | | | | Bug: 7333492 Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
* | | | am a4ccb4af: Merge "fixed manta image size and double FX issue" into ↵John Hoford2012-10-115-12/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197': fixed manta image size and double FX issue
| * | | Merge "fixed manta image size and double FX issue" into gb-ub-photos-archesJohn Hoford2012-10-115-12/+35
| |\ \ \
| | * | | fixed manta image size and double FX issueJohn Hoford2012-10-115-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7328636 Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
* | | | | am dd158691: Merge "Change ActionBar spinner text size on rotate" into ↵Bobby Georgescu2012-10-112-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'dd1586912b5da958b33a0d9f07312160d1cb103b': Change ActionBar spinner text size on rotate
| * | | | Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-archesBobby Georgescu2012-10-112-0/+10
| |\ \ \ \
| | * | | | Change ActionBar spinner text size on rotateBobby Georgescu2012-10-112-0/+10
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7333151 Update the grid/filmstrip spinner switch text to look and behave like the text in the Gmail app, as requested by UX. Change-Id: If822b21899172a35402477868d4f146a8e00cfea
* | | | | am 825afb1b: Move calls to LightCycleHelper off the UI thread.Mangesh Ghiware2012-10-118-84/+224
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit '825afb1b3e7d15b5c258d664ee008dc68da1c407': Move calls to LightCycleHelper off the UI thread.
| * | | Move calls to LightCycleHelper off the UI thread.Mangesh Ghiware2012-10-118-84/+224
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7320303 Replace multiple methods in LightCycleHelper with a single one that returns relevant metadata. Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
* | | am 37a93336: Merge "Clear cached stitching preview thumbnails." into ↵George Mount2012-10-111-0/+12
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '37a9333651cead185d982d9b809cb3425a24d3d8': Clear cached stitching preview thumbnails.
| * | Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-archesGeorge Mount2012-10-111-0/+12
| |\ \
| | * | Clear cached stitching preview thumbnails.George Mount2012-10-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7328408 Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
* | | | am bebc94be: Merge "Fix size of peripheral items when first opening ↵Bobby Georgescu2012-10-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | filmstrip" into gb-ub-photos-arches * commit 'bebc94be08667b474587592169155e6cb9855e77': Fix size of peripheral items when first opening filmstrip
| * | | Merge "Fix size of peripheral items when first opening filmstrip" into ↵Bobby Georgescu2012-10-111-0/+1
| |\ \ \ | | | | | | | | | | | | | | | gb-ub-photos-arches
| | * | | Fix size of peripheral items when first opening filmstripBobby Georgescu2012-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7327570 Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff
* | | | | am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into ↵John Hoford2012-10-1110-31/+90
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '7f34a6a5f21209c22584680f280723584e2c28e7': Fix application of FX to not wipe out borders etc.
| * | | | Merge "Fix application of FX to not wipe out borders etc." into ↵John Hoford2012-10-1110-31/+90
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | gb-ub-photos-arches
| | * | | Fix application of FX to not wipe out borders etc.John Hoford2012-10-1110-31/+90
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7289442 Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
* | | | | am 5cca8b99: Fix portrait orientation on landscape devicesJohn Reck2012-10-111-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5cca8b99bebe6a9fbb191a8e1364b81e309a1390': Fix portrait orientation on landscape devices
| * | | | Fix portrait orientation on landscape devicesJohn Reck2012-10-111-1/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 7328349 Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
* | | | am fb6edb42: Remove compare and reset from apply bar and fix text.Ruben Brunk2012-10-112-56/+5
|\| | | | | | | | | | | | | | | | | | | * commit 'fb6edb42e7e0b132844d4e87c2a76c758f48b684': Remove compare and reset from apply bar and fix text.
| * | | Remove compare and reset from apply bar and fix text.Ruben Brunk2012-10-112-56/+5
| | | | | | | | | | | | | | | | | | | | Bug: 7326079 Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
* | | | am 7761357f: Behavior of camera filmstrip in gallery closer to cameraBobby Georgescu2012-10-111-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '7761357f4a55de6745ac5172355d1a09a9a37492': Behavior of camera filmstrip in gallery closer to camera
| * | | Behavior of camera filmstrip in gallery closer to cameraBobby Georgescu2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 7329118 Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
* | | | am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperationsBobby Georgescu2012-10-111-6/+10
|\| | | | | | | | | | | | | | | | | | | * commit '4d302b8a826ece492c2abefd56b780a65899663e': Fix NPE in PhotoPage.updateMenuOperations
| * | | Fix NPE in PhotoPage.updateMenuOperationsBobby Georgescu2012-10-101-6/+10
| |/ / | | | | | | | | | | | | Bug: 7324012 Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b
* | | am c735669f: Merge "Make album set grid view reflect latest UI mocks" into ↵Bobby Georgescu2012-10-102-6/+5
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'c735669fdbd1aec674412f43e64b956e8c10b643': Make album set grid view reflect latest UI mocks
| * | Merge "Make album set grid view reflect latest UI mocks" into ↵Bobby Georgescu2012-10-102-6/+5
| |\ \ | | | | | | | | | | | | gb-ub-photos-arches
| | * | Make album set grid view reflect latest UI mocksBobby Georgescu2012-10-102-6/+5
| | |/ | | | | | | | | | | | | Bug: 7300836 Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
* | | am f8a46874: Merge "Defer expensive UI updates in filmstrip" into ↵Bobby Georgescu2012-10-101-7/+38
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'f8a46874235b3169a68f8bd6566c81b44de34e7a': Defer expensive UI updates in filmstrip
| * | Defer expensive UI updates in filmstripBobby Georgescu2012-10-101-7/+38
| |/ | | | | | | | | | | | | | | | | | | | | Bug: 7322925 When using the filmstrip, delay expensive updates to the action bar and share menus, some of which may require disk accesses, until the rate of change of photos slows down, instead of doing this work for every single image that flies by. Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd
* | am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into ↵George Mount2012-10-101-6/+8
|\| | | | | | | | | | | | | gb-ub-photos-arches * commit '2cb4269ebc665c2f2786a8a81794d15b36e3a38c': Fix NPE due to progress bar not existing.
| * Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-archesGeorge Mount2012-10-101-6/+8
| |\
| | * Fix NPE due to progress bar not existing.George Mount2012-10-101-6/+8
| | | | | | | | | | | | | | | | | | Bug 7325685 Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
* | | am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into ↵Bobby Georgescu2012-10-101-3/+0
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'b4a3f4764a58d6d918d96399e1b05db887b9f9ad': Change FilterShow theme and extra remove gray line
| * | Merge "Change FilterShow theme and extra remove gray line" into ↵Bobby Georgescu2012-10-101-3/+0
| |\ \ | | |/ | |/| | | | gb-ub-photos-arches
| | * Change FilterShow theme and extra remove gray lineBobby Georgescu2012-10-101-3/+0
| | | | | | | | | | | | | | | Bug: 7326326 Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
* | | am 53f24f0f: forced fx bitmaps to load unscaledJohn Hoford2012-10-101-1/+3
|\| | | | | | | | | | | | | | * commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f': forced fx bitmaps to load unscaled