summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-archesTeng-Hui Zhu2012-09-273-14/+16
|\ \
| * | Trimming: switch to use sherlock action barTeng-Hui Zhu2012-09-263-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Show a "done" instead of the icon according to the UX team. And we don't have API level dependency. bug:7093240 Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
* | | Several secure album changes.Wu-cheng Li2012-09-272-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make the lock screen photo be a standard portrait size photo - In the filmstrip, have the first tap on the lock screen photo take the user directly to the unlock screen. - Switch the asset to be a "locked" lock rather than an "unlocked" lock. bug:7192331 Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
* | | Merge "Don't set treat back as up if there is no parent album." into ↵Owen Lin2012-09-261-9/+12
|\ \ \ | | |/ | |/| | | | gb-ub-photos-arches
| * | Don't set treat back as up if there is no parent album.Owen Lin2012-09-261-9/+12
| | | | | | | | | | | | | | | Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274 fix: 7180467
* | | Merge "Show unlock image in secure album only when camera roll has items." ↵Wu-cheng Li2012-09-261-2/+20
|\ \ \ | | | | | | | | | | | | into gb-ub-photos-arches
| * | | Show unlock image in secure album only when camera roll has items.Wu-cheng Li2012-09-261-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | bug:7192331 Change-Id: I8e0a9ea87181c2256632a4dc802cc0668fac1e0e
* | | | Load the correct library...nicolasroard2012-09-261-1/+1
| |_|/ |/| | | | | | | | | | | bug:7165910 Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953
* | | Only create debugTag if necessaryJohn Reck2012-09-261-5/+8
| | | | | | | | | | | | | | | | | | | | | Bug: 7238418 String concatenation isn't free Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931
* | | Don't requery a constantJohn Reck2012-09-261-1/+8
| | | | | | | | | | | | | | | | | | Bug: 7238418 Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b
* | | Initial import of the new image editornicolasroard2012-09-2638-0/+4036
| | | | | | | | | | | | | | | bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
* | | Fix behavior of up button in Camera appBobby Georgescu2012-09-263-8/+12
| | | | | | | | | | | | | | | | | | | | | Bug: 7233448 - Up button now goes to gallery root when appropriate. Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
* | | Merge "Avoid unnecessary allocation" into gb-ub-photos-archesJohn Reck2012-09-261-6/+20
|\ \ \
| * | | Avoid unnecessary allocationJohn Reck2012-09-261-6/+20
| |/ / | | | | | | | | | | | | | | | Bug: 7238418 Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310
* | | Merge "Trimming: switch to use selectors." into gb-ub-photos-archesTeng-Hui Zhu2012-09-262-69/+118
|\ \ \ | |_|/ |/| |
| * | Trimming: switch to use selectors.Teng-Hui Zhu2012-09-262-69/+118
| | | | | | | | | | | | | | | | | | | | | | | | Switch into using 2 selectors for the starting and end point of triming. Shift the bar up a bit to accommandate the selectors. bug:7093240 Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
* | | Fix display of clustering items in album set pageBobby Georgescu2012-09-261-0/+8
| |/ |/| | | | | | | | | | | | | Bug: 7217602 There was an incorrect assumption that onCreateActionBar would always be called before onResume. Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b
* | Merge "Making switchState public" into gb-ub-photos-archesDoris Liu2012-09-251-1/+1
|\ \
| * | Making switchState publicDoris Liu2012-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7208910 switchState was only accessible within package com.android.gallery3d.app . Now changing it to public so that it can be called from camera. This is part 1 of 2 in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome. Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29
* | | Grid/filmstrip switching behavior improvementsBobby Georgescu2012-09-254-50/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7200453 Bug: 7196483 Bug: 7222179 Bug: 7224619 Changes: - Launch camera in capture even if paused in grid/filmstrip - Fixed behavior of filmstrip button after launching grid from camera - Refresh bar timeouts after swiping a photo - Partially swiping from camera to filmstrip without lifting finger and then swiping back no longer results in unwanted switch to filmstrip - Removed hacky solution to switching to filmstrip mode Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
* | | Add API check for "context" input port of effects recording.Wu-cheng Li2012-09-251-0/+4
| | | | | | | | | | | | | | | bug:7106963 Change-Id: Ia065903dd120bf20862c6adfd8a699277a27ac50
* | | Merge "Add an unlock image in the end of secure album." into gb-ub-photos-archesWu-cheng Li2012-09-255-7/+127
|\ \ \
| * | | Add an unlock image in the end of secure album.Wu-cheng Li2012-09-255-7/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When camera is started from secure lock screen, put placeholder "proto-photo" at the end of the camera roll. When it is clicked, it takes the user to the lock screen. bug:7192331 Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
* | | | Enable effects recording in JellyBean.Pin Ting2012-09-251-1/+2
|/ / / | | | | | | | | | | | | Bug:7106963 Change-Id: I2ef0a30d1b9c970fdd9ce01459173db3bde99c6b
* | | Restore missing "Group by" option in camera roll grid viewBobby Georgescu2012-09-241-0/+3
| | | | | | | | | | | | | | | Bug: 7217410 Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88
* | | Fix occasional crash when restoring photo page stateBobby Georgescu2012-09-241-1/+4
| |/ |/| | | | | | | | | | | | | | | Bug: 7216012 If the saved state being used to restore the photo page includes an out-of-bounds index, ignore it and reset the index to 0. Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0
* | The trimming solution with the mp4parser library.Teng-Hui Zhu2012-09-244-6/+332
| | | | | | | | | | | | bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
* | Use vendor specific MIME type for sharing LightCycle panoramasMangesh Ghiware2012-09-236-14/+27
|/ | | | | Bug: 7150324 Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719
* Snap a photo to the center after fling ends in filmstripBobby Georgescu2012-09-211-3/+1
| | | | | Bug: 7050303 Change-Id: I7770d5642b376a1b888f34c5806f2291b64ecf68