summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix activity stack when restarting the screen nailcm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0Ricardo Cerqueira2013-05-241-0/+4
| | | | | | | We were stacking multiple activities, resulting in the need for multiple destructions (back key events) when killing the camera app Change-Id: I7ec61c517d25f7e47baf47fcd1696f987631c344
* Revert "Revert "Add storage selection (2/2)""cm-10.1.0-RC2cm-10.1.0-RC1Steve Kondik2013-05-051-0/+20
| | | | This reverts commit 27f80c30596362e2f9a3e2045068fdd6c2f9a168.
* Merge "Gallery2: ES translations" into cm-10.1Marco Brohet2013-04-291-20/+0
|\
| * Gallery2: ES translationsdjMesias2013-04-291-20/+0
| | | | | | | | | | | | - Update filtershow messages: http://review.cyanogenmod.org/36582 Change-Id: Id189b229064d64c1d3f98ffeb967115ce72fa68c
* | Merge "Spline: limit control point X co-ordinates to the graph area." into ↵Danny Baumann2013-04-292-3/+10
|\ \ | |/ |/| | | cm-10.1
| * Spline: limit control point X co-ordinates to the graph area.Darren Salt2013-04-252-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an oversight in the control point handling which allows the X co-ordinate to be outside the range 0..1 if the width of the graph (including margins) is less than the width of the display. On my Nexus 4, without this fix, this problem occurs in landscape mode when dragging a control point outside the graph area, effectively onto the system buttons area. This bad X co-ordinate and a lack of bounds checking causes an 'index out of range' exception to be thrown from within Spline.getAppliedCurve(). The Y co-ordinate is already suitably handled; this commit copies and adapts that handling for the X co-ordinate. It also adds the necessary bounds checking to Spline.getAppliedCurve(). Change-Id: I325a1b6837927a6dd050b30209a7beeadf76d089
* | Gallery2: Refactor default translationsMarco Brohet2013-04-2951-98/+57
|/ | | | Change-Id: I71f7e47846035c220e545f34f7ab1650b4837a3e
* Gallery2: ES translationsdjMesias2013-04-183-8/+21
| | | | | | | - Restore AOSP strings - Move CM additions to new file Change-Id: I22089dc040df86a430f8aa1449915a0b4db09d31
* Revert "Add storage selection (2/2)"Steve Kondik2013-04-171-20/+0
| | | | | | | | * Not needed. This reverts commit bffa11174ba8f85ada239e3044b441d61ac4c3ba. Change-Id: Ibf1dfa1fc70dba5a5cc1cb2cf16d0e25de74f376
* Add storage selection (2/2)Gary2013-04-131-0/+20
| | | | Change-Id: I364c9fd43c48195248d374e2f441fad2280aa4de
* es_ES: Fix spanish translationscm-10.1-M3djMesias2013-03-132-3/+8
| | | | | | | - Move CM additions to end of file - Add missing translation Change-Id: I90de978f4f386acdc72cde57d6bb704f0039ccbd
* [2/2] Camera: add software HDR renderingcm-10.1-M2XpLoDWilD2013-02-161-0/+1
| | | | | | | Since Camera stuff is compiled with Gallery2, we have to make sure the renderscript files are compiled too. Change-Id: Ia377a6f1e4839000aa528febc5c2b3fe42155be6
* Merge tag 'android-4.2.2_r1' of ↵mr1.1-stagingSteve Kondik2013-02-1228-173/+306
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Gallery2 into 1.1 Android 4.2.2 release 1
| * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-180-0/+0
| |\
| | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-100-0/+0
| | |\
| | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-050-0/+0
| | | |\
| | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-040-0/+0
| | | | |\
| | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-290-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-190-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-160-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | | | | | | | | |\
| * | | | | | | | | \ am 5b188c94: Disabled further filters after Tiny Planet.Ruben Brunk2012-12-182-1/+36
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b188c94f5895cd166fc29def1e5295498e298c9': Disabled further filters after Tiny Planet.
| | * | | | | | | | | Disabled further filters after Tiny Planet.Ruben Brunk2012-12-172-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7407176 Temporary fix. We need to handle filters changing the image geometry properly. Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
| * | | | | | | | | | am 695e1aa0: Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
| |\| | | | | | | | | | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229': Force a layout pass if the display rotation changes
| | * | | | | | | | Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7687209 DisplayRotation is used to map camera orientation to the display and is updated in layoutContentPane(). However, in the case of a 180 rotate framework doesn't send an onConfigurationChanged nor does the layout dimensions change, thus layoutContentPane doesn't fire and we don't update mDisplayRotation, resulting in an upside-down preview. To handle this, check each draw whether or not the display rotation has changed and if it has force a layout pass. Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
| * | | | | | | | | am db99a10b: Fix NPE in PhotoPageBobby Georgescu2012-12-051-1/+3
| |\| | | | | | | | | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db99a10b6ac9296d612db8ba51e37f141fee4170': Fix NPE in PhotoPage
| | * | | | | | | Fix NPE in PhotoPageBobby Georgescu2012-12-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7673141 Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
| * | | | | | | | am 870e62ac: Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '870e62ac801064f83bffc9095cbaee5fe46bdd80': Handle the case where the orientation column is not here...
| | * | | | | | | Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7537610 Change-Id: I4f64891a789358c20206aea3033fd17514199d62
| * | | | | | | | am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-archesMichael Kolb2012-12-041-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a': Prevent Camera UI in Gallery
| | * | | | | | | Merge "Prevent Camera UI in Gallery" into gb-ub-photos-archesMichael Kolb2012-12-041-1/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Prevent Camera UI in GalleryMichael Kolb2012-12-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7668856 At startup, the PhotoView wouldn't execute the onFullScreenChanged callback, so the Camera UI believed it was in Camera. Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
| * | | | | | | | | am c6fe9f7d: Remove unneeded border assetnicolasroard2012-12-041-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644': Remove unneeded border asset
| | * | | | | | | | Remove unneeded border assetnicolasroard2012-12-041-0/+0
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7668120 Change-Id: Ib258fe12655bd33c08257975cac995bc54c7abb2
| * | / / / / / / am 04df59eb: Merge "Change themes" into gb-ub-photos-archesYour Name2012-12-032-1/+3
| |\| | | | | | | | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '04df59eb082189500d360fffb95ef541073d6fe6': Change themes
| | * | | | | | Merge "Change themes" into gb-ub-photos-archesYour Name2012-12-032-1/+3
| | |\ \ \ \ \ \
| | | * | | | | | Change themesYour Name2012-12-032-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7587841 Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e
| * | | | | | | | am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align ↵nicolasroard2012-11-292-7/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | histogram with Curves grid. * commit '599393ecad6803161d5e901ef625e34cfe088009': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
| | * | | | | | | (re-)add vertical/horizontal lines when moving Curvesnicolasroard2012-11-292-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align histogram with Curves grid. bug:7361722 Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
| * | | | | | | | am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6502545991948769bc9ca725dafb9899c2635a01': Added dashed diagonal for crop.
| | * | | | | | | Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added dashed diagonal for crop.Ruben Brunk2012-11-283-7/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7634466 Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
| * | | | | | | | | am 39d46790: Fix transparency issue under the spinner.nicolasroard2012-11-281-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '39d4679070caf308f04542e414fc2e3c34f9cefa': Fix transparency issue under the spinner.
| | * | | | | | | | Fix transparency issue under the spinner.nicolasroard2012-11-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7634701 Change-Id: I907ebbb373958350b1b17dc86723e430441a01dd
| * | | | | | | | | am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)nicolasroard2012-11-282-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a624bb8db70f1e71ca511756b886c68f32fedbe': Fix potential crash (regression introduced with fix for 7406402)
| | * | | | | | | | Fix potential crashnicolasroard2012-11-282-0/+6
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (regression introduced with fix for 7406402) bug:7406402 Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
| * | | | | | | | am 6d867ce0: Set crop ratio to unconstrained by default.nicolasroard2012-11-283-4/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef': Set crop ratio to unconstrained by default.
| | * | | | | | | Set crop ratio to unconstrained by default.nicolasroard2012-11-283-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7634466 Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
| * | | | | | | | am 205d0cdf: Fix overdraw the correct way...nicolasroard2012-11-282-4/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '205d0cdf0590bc1156a1d7fff1d0811d142de4a6': Fix overdraw the correct way...
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 11:26:51 +0000