summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Remove ActionBarSherlockOwen Lin2012-10-0295-30566/+63
| | | | | | | | | | | | bug: 7242682 Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
* | Merge "Update assets of the lock screen image in the secure album." into ↵Wu-cheng Li2012-10-011-1/+1
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Update assets of the lock screen image in the secure album.Wu-cheng Li2012-10-021-1/+1
| | | | | | | | | | | | | | | bug:7192331 Change-Id: I551e14420e43106e97b093884571eaea27b00425
* | | Merge "Revert "Enable swiping from LightCycle to Gallery"" into ↵George Mount2012-10-012-54/+0
|\ \ \ | | | | | | | | | | | | gb-ub-photos-arches
| * | | Revert "Enable swiping from LightCycle to Gallery"George Mount2012-10-012-54/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b Changed mechanism for enabling swipe in LightCycle. Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d
* | | | Merge "Improve display of ActionBar album mode switcher" into ↵Bobby Georgescu2012-10-013-4/+17
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-arches
| * | | | Improve display of ActionBar album mode switcherBobby Georgescu2012-10-013-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7265942 Bug: 7266862 - Ellipsize the title of the album when appropriate - Show correctly title when swiping from camera to gallery - Hide the delete icon in the overflow menu to match the latest UX mocks, making more room for title Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940
* | | | | Merge "Fix exposure and fixed warnings" into gb-ub-photos-archesJohn Hoford2012-10-012-6/+7
|\ \ \ \ \
| * | | | | Fix exposure and fixed warningsJohn Hoford2012-10-012-6/+7
| |/ / / / | | | | | | | | | | | | | | | bug:7234321
* | | | | Merge "Fix for exceptions when image has no orientation data." into ↵Ruben Brunk2012-10-011-5/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-arches
| * | | | | Fix for exceptions when image has no orientation data.Ruben Brunk2012-10-011-5/+13
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7219163 When image has no orientation data, getOrientation now catches the SQLiteException. Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984
* | | | | Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-archesGeorge Mount2012-10-012-0/+54
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Enable swiping from LightCycle to GalleryGeorge Mount2012-10-012-0/+54
| |/ / | | | | | | | | | | | | | | | Bug 7212420 Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402
* | | Move grid/filmstrip switching to ActionBar title "spinner"Bobby Georgescu2012-10-013-75/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7233818 Bug: 7240846 Bug: 7258973 Tapping the title of the album, whether in filmstrip or grid mode, allows switching between these modes using a menu. The album name is now displayed when viewing pictures in the filmstrip or zoomed in modes. Finally, no longer allow switching to grid mode when not appropriate. Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0
* | | Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-archesJohn Reck2012-10-011-0/+1
|\ \ \ | |/ / |/| |
| * | Remove OnFrameAvailableListener in tear downJohn Reck2012-10-011-0/+1
| |/ | | | | | | | | | | Bug: 7217305 Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57
* / More logs for gallery crash error, remove a potential causeBobby Georgescu2012-10-012-5/+13
|/ | | | | | | | | | Bug: 7216012 Made sure that FilterDeleteSet doesn't ever return stale item counts, added extra logging in LocalMergeAlbum for NoSuchElementException so that we can have more info to diagnose this crash if it happens in the future. Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03
* Merge "Fix border bug and filter application - fix layout (use framelayout) ↵nicolasroard2012-09-3021-204/+287
|\ | | | | | | - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
| * Fix border bug and filter applicationnicolasroard2012-09-2921-204/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now bug:7256090 bug:7249672 bug:7234317 bug:7225150 Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
* | Merge "Fix crash in album page" into gb-ub-photos-archesBobby Georgescu2012-09-302-2/+6
|\ \
| * | Fix crash in album pageBobby Georgescu2012-09-302-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7258955 Avoid second call to onPause when finishing ActivityState instance within onPause. Change-Id: I6081a6467e109a6edf35e60d24193e550cb0dd21
* | | Merge "Trimming: clean up strings and prevent too short or no trimming." ↵Teng-Hui Zhu2012-09-301-8/+27
|\ \ \ | |/ / |/| | | | | into gb-ub-photos-arches
| * | Trimming: clean up strings and prevent too short or no trimming.Teng-Hui Zhu2012-09-291-8/+27
| |/ | | | | | | | | | | | | Also view the result if the activity is not stopped. bug:7093055 Change-Id: If244d567a4be9da22542398f6b7c22a081786339
* | Merge "Remove video play icon and tap to play behavior for panorama." into ↵Mangesh Ghiware2012-09-304-28/+2
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Remove video play icon and tap to play behavior for panorama.Mangesh Ghiware2012-09-304-28/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | Bug: 7258968 Per new UX design, there'll be a panorama viewer icon in the bottom right instead (see b/7233446) This is essentially a revert of Change-Id I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3 Change-Id: Ib35c99cca4ee9b2422dd16f5ea3b931ad5f08f35
* | Update FX/pano button appearance, placement, animationBobby Georgescu2012-09-301-2/+2
| | | | | | | | | | | | Bug: 7213162 Bug: 7233446 Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e
* | Disable effects recording UI.Wu-cheng Li2012-09-301-2/+1
|/ | | | | bug:7106963 Change-Id: I1c056b30efd9b2d8c976b611ada971a8bff1ad87
* Remove the individual Curves channel filtersnicolasroard2012-09-281-171/+109
| | | | | | | Reorder the filters bug:7234317 Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
* Add contrast & brightness filtersJohn Hoford2012-09-286-4/+449
| | | | | | | | Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure bug:7234321 Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
* Improve ActionBarnicolasroard2012-09-281-2/+9
| | | | | | | | | - show both undo and redo - add the checkmark with done instead of the up mark bug:7233986 Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
* Merge "Debounce after quick fling towards camera but zoom if slow" into ↵Bobby Georgescu2012-09-283-17/+70
|\ | | | | | | gb-ub-photos-arches
| * Debounce after quick fling towards camera but zoom if slowBobby Georgescu2012-09-283-17/+70
| | | | | | | | | | | | Bug: 7250026 Bug: 7213802 Change-Id: I3c900813937161744a36015469c70112f2cf356b
* | Fix NPE in GalleryActionBarMangesh Ghiware2012-09-282-13/+17
| | | | | | | | | | Bug: 7252666 Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
* | Change the slider values range to -100 -> 100nicolasroard2012-09-281-1/+5
| | | | | | | | | | bug:7247494 Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0
* | Merge "Fixed behavior for back key when viewing download." into ↵Ruben Brunk2012-09-281-0/+32
|\ \ | |/ |/| | | gb-ub-photos-arches
| * Fixed behavior for back key when viewing download.Ruben Brunk2012-09-261-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7205463 Bug: 7164238 Bug: 7175040 When viewing an image via the download notification from browser, changed the default behavior of the back key to take the user to the downloads folder. Change-Id: Ia842bfa0f23c3b0ba767e3f0447add2c9b2cc6a7
* | Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-archesTeng-Hui Zhu2012-09-281-6/+3
|\ \
| * | Trimming: Use OnClickListener for savingTeng-Hui Zhu2012-09-281-6/+3
| | | | | | | | | | | | | | | | | | bug:7093055 Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
* | | Show a placeholder when the camera filmstrip is emptyBobby Georgescu2012-09-288-75/+261
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7213757 Tapping the placeholder takes the user back to the full-screen camera capture mode. Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
* | | Merge "Update to sharing panorama" into gb-ub-photos-archesMangesh Ghiware2012-09-275-43/+124
|\ \ \
| * | | Update to sharing panoramaMangesh Ghiware2012-09-275-43/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7150324 Use separate share intents for sharing panoarma and regular JPGs. If photo is a 360 panorama, promote sharing it on the action bar, and move sharing as JPG to overflow menu. MIME type changed to specify panorama360. Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
* | | | Merge "Use an actionbar - move the "show original" button to the bottom left ↵nicolasroard2012-09-274-102/+103
|\ \ \ \ | | | | | | | | | | | | | | | - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
| * | | | Use an actionbarnicolasroard2012-09-274-102/+103
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu. bug:7234317 bug:7233975 bug:7233986 Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
* / / / Fix up button behavior in camera appBobby Georgescu2012-09-271-1/+5
|/ / / | | | | | | | | | | | | Bug: 7233448 Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
* | | We weren't applying the parameter on an existing filternicolasroard2012-09-271-1/+1
| | | | | | | | | | | | | | | bug:7247494 Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2
* | | Only apply the parameter to the currently edited filternicolasroard2012-09-274-19/+15
| | | | | | | | | | | | | | | bug:7247494 Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
* | | Merge "Fix Monkey NPE" into gb-ub-photos-archesJohn Reck2012-09-271-1/+3
|\ \ \
| * | | Fix Monkey NPEJohn Reck2012-09-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7243032 Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197
* | | | Remove the pie slider, add a linear slidernicolasroard2012-09-275-192/+183
| |/ / |/| | | | | | | | | | | | | | bug:7247494 Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79
* | | Trimming: clean up the UI for trimming.Teng-Hui Zhu2012-09-272-38/+27
|/ / | | | | | | | | | | | | | | | | | | Get rid of the home button and use the done button only in the action bar. Switch back to use system actionbar / activity. Rename the ShortenExample. bug:7093240 Change-Id: I61684e9723af12cecc212bbd911c23aab0258463