OSDN Git Service
John Reck [Mon, 10 Dec 2012 23:34:57 +0000 (15:34 -0800)]
am
360ae4dd: am
f6bc102c: am
695e1aa0: Force a layout pass if the display rotation changes
* commit '
360ae4ddf31136e5a29792a212dfb9949e45be74':
Force a layout pass if the display rotation changes
John Reck [Mon, 10 Dec 2012 22:17:54 +0000 (14:17 -0800)]
am
f6bc102c: am
695e1aa0: Force a layout pass if the display rotation changes
* commit '
f6bc102ca181ebe3064aa211b736de213a5d31e2':
Force a layout pass if the display rotation changes
John Reck [Mon, 10 Dec 2012 22:16:12 +0000 (14:16 -0800)]
am
695e1aa0: Force a layout pass if the display rotation changes
* commit '
695e1aa059cbc2cb2988f6beb0fee8ff7952b229':
Force a layout pass if the display rotation changes
John Reck [Mon, 10 Dec 2012 21:25:49 +0000 (13:25 -0800)]
Force a layout pass if the display rotation changes
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
The Android Open Source Project [Wed, 5 Dec 2012 19:10:12 +0000 (11:10 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: If914c03547187deadfbb5f9c3fdff0cbe954ecba
The Android Automerger [Wed, 5 Dec 2012 18:27:55 +0000 (10:27 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Bobby Georgescu [Wed, 5 Dec 2012 17:48:33 +0000 (09:48 -0800)]
am
02a5f562: am
30c71e7c: am
db99a10b: Fix NPE in PhotoPage
* commit '
02a5f56289a9430bd70437e534ef1bb186a4fc70':
Fix NPE in PhotoPage
Bobby Georgescu [Wed, 5 Dec 2012 17:47:08 +0000 (09:47 -0800)]
am
30c71e7c: am
db99a10b: Fix NPE in PhotoPage
* commit '
30c71e7c7654f97c9662c7b315a6519e2a7ed1ec':
Fix NPE in PhotoPage
Bobby Georgescu [Wed, 5 Dec 2012 17:44:35 +0000 (09:44 -0800)]
am
db99a10b: Fix NPE in PhotoPage
* commit '
db99a10b6ac9296d612db8ba51e37f141fee4170':
Fix NPE in PhotoPage
Bobby Georgescu [Wed, 5 Dec 2012 07:50:02 +0000 (23:50 -0800)]
Fix NPE in PhotoPage
Bug:
7673141
Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
The Android Automerger [Wed, 5 Dec 2012 03:59:17 +0000 (19:59 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
nicolasroard [Wed, 5 Dec 2012 03:08:32 +0000 (19:08 -0800)]
am
53c024ab: am
1d84ed07: am
870e62ac: Handle the case where the orientation column is not here...
* commit '
53c024ab0538774ede9b33d2cf5e89c71236f084':
Handle the case where the orientation column is not here...
nicolasroard [Wed, 5 Dec 2012 03:06:55 +0000 (19:06 -0800)]
am
1d84ed07: am
870e62ac: Handle the case where the orientation column is not here...
* commit '
1d84ed072e731fa447ca9fb6ca1d50e7c1f3930c':
Handle the case where the orientation column is not here...
nicolasroard [Wed, 5 Dec 2012 03:04:38 +0000 (19:04 -0800)]
am
870e62ac: Handle the case where the orientation column is not here...
* commit '
870e62ac801064f83bffc9095cbaee5fe46bdd80':
Handle the case where the orientation column is not here...
Michael Kolb [Wed, 5 Dec 2012 00:37:27 +0000 (16:37 -0800)]
am
b23a56f9: am
527b201b: am
7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
* commit '
b23a56f98f4d04d8fa2841d79142dc626f37be8d':
Prevent Camera UI in Gallery
nicolasroard [Wed, 5 Dec 2012 00:37:26 +0000 (16:37 -0800)]
am
87884b28: am
a8ecc0bf: am
c6fe9f7d: Remove unneeded border asset
* commit '
87884b2804c661a711f7db38c45ecea397d201ac':
Remove unneeded border asset
Michael Kolb [Wed, 5 Dec 2012 00:32:02 +0000 (16:32 -0800)]
am
527b201b: am
7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
* commit '
527b201b52e9136989eb1eccb7e71a25cfe8027d':
Prevent Camera UI in Gallery
nicolasroard [Wed, 5 Dec 2012 00:31:51 +0000 (16:31 -0800)]
am
a8ecc0bf: am
c6fe9f7d: Remove unneeded border asset
* commit '
a8ecc0bf1140deececc1c75dffc9243e524d02f8':
Remove unneeded border asset
nicolasroard [Wed, 5 Dec 2012 00:22:40 +0000 (16:22 -0800)]
Handle the case where the orientation column is not here...
bug:
7537610
Change-Id: I4f64891a789358c20206aea3033fd17514199d62
Michael Kolb [Tue, 4 Dec 2012 23:14:28 +0000 (15:14 -0800)]
am
7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
* commit '
7a5377322dcebdaad98df9a31cadc7ff0f464d8a':
Prevent Camera UI in Gallery
Michael Kolb [Tue, 4 Dec 2012 23:12:46 +0000 (15:12 -0800)]
Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
Michael Kolb [Tue, 4 Dec 2012 22:46:23 +0000 (14:46 -0800)]
Prevent Camera UI in Gallery
Bug:
7668856
At startup, the PhotoView wouldn't execute the onFullScreenChanged
callback, so the Camera UI believed it was in Camera.
Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
nicolasroard [Tue, 4 Dec 2012 22:42:15 +0000 (14:42 -0800)]
am
c6fe9f7d: Remove unneeded border asset
* commit '
c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644':
Remove unneeded border asset
nicolasroard [Tue, 4 Dec 2012 22:11:09 +0000 (14:11 -0800)]
Remove unneeded border asset
bug:
7668120
Change-Id: Ib258fe12655bd33c08257975cac995bc54c7abb2
Your Name [Tue, 4 Dec 2012 00:18:15 +0000 (16:18 -0800)]
am
4f5fca2f: am
17290ae6: am
04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '
4f5fca2f0d8f845891b671417c2328a53c95a32e':
Change themes
Your Name [Tue, 4 Dec 2012 00:16:57 +0000 (16:16 -0800)]
am
17290ae6: am
04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '
17290ae6fd9d3622f4c33ff63788cd31b20acb93':
Change themes
Your Name [Tue, 4 Dec 2012 00:15:33 +0000 (16:15 -0800)]
am
04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '
04df59eb082189500d360fffb95ef541073d6fe6':
Change themes
Your Name [Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)]
Merge "Change themes" into gb-ub-photos-arches
Your Name [Mon, 3 Dec 2012 22:14:19 +0000 (14:14 -0800)]
Change themes
Bug:
7587841
Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e
The Android Open Source Project [Thu, 29 Nov 2012 23:41:39 +0000 (15:41 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I86943fad736a17b095608fdd4a98411979e31694
nicolasroard [Thu, 29 Nov 2012 22:27:36 +0000 (14:27 -0800)]
am
ad374359: am
cad5c1af: am
599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
* commit '
ad37435996c44e66a6ba2c6c05cefff55ee6a124':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
Nicolas Roard [Thu, 29 Nov 2012 22:27:27 +0000 (14:27 -0800)]
am
a66584f1: am
8c592dc8: am
65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
* commit '
a66584f16604130440c565ab9f00cf17e89171e3':
Added dashed diagonal for crop.
nicolasroard [Thu, 29 Nov 2012 22:27:22 +0000 (14:27 -0800)]
am
d2a2c924: am
992d32d9: am
39d46790: Fix transparency issue under the spinner.
* commit '
d2a2c924106aa66a60d4556cc3b4879ddf28d472':
Fix transparency issue under the spinner.
nicolasroard [Thu, 29 Nov 2012 22:27:21 +0000 (14:27 -0800)]
am
0d9b166b: am
466f3d9b: am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
0d9b166b93c0b61990d9743c8a44667c5de3af6a':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 22:27:20 +0000 (14:27 -0800)]
am
92b91af5: am
33a487f6: am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
92b91af579ae5e631a0428b85cc09dac0cea5712':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 22:27:17 +0000 (14:27 -0800)]
am
39b06307: am
83705e99: am
205d0cdf: Fix overdraw the correct way...
* commit '
39b063070545e0b34d1c8ab1aa97abfd147a3bb7':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 22:27:12 +0000 (14:27 -0800)]
am
188a0e33: am
85135c1b: am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
188a0e336bbd6a6a60b5f687b9f68bb49c05f7aa':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 22:27:11 +0000 (14:27 -0800)]
am
170752be: am
b25cb646: am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
170752be69aebc031ccac54d20c7ca77e7c99eb1':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 22:27:09 +0000 (14:27 -0800)]
am
df4d2631: am
69a77e9e: am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
df4d2631aa1570e4115ee765c023a69775c2a08e':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 22:27:08 +0000 (14:27 -0800)]
am
8abe023c: am
a12b3542: am
cd84d676: Fix history panel overlap
* commit '
8abe023c7327ef438d161556e8aaa6925b91b60b':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 22:26:16 +0000 (14:26 -0800)]
am
db8647e9: am
e4b3e7a8: am
987bc8aa: Fix wrong colors in Curves
* commit '
db8647e9d655cd620cc1f2b6a2535608867dcae2':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 22:26:15 +0000 (14:26 -0800)]
am
ae2408be: am
e0a22a0b: am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
ae2408bedcdea7e9a8bb35e1f7a75611ac19948d':
Fix moving points in the Curves editor
Ruben Brunk [Thu, 29 Nov 2012 22:26:11 +0000 (14:26 -0800)]
am
e88e1fac: am
17b8c517: am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
e88e1fac86517a733669c5766f9cc78845978e8b':
Added locking to ImageLoader.
John Hoford [Thu, 29 Nov 2012 22:26:10 +0000 (14:26 -0800)]
am
060060d5: am
a8a9c933: am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
060060d5ead8abca617129e0a79165cda956947a':
reduce size of tiny planet if malloc fails
nicolasroard [Thu, 29 Nov 2012 22:25:56 +0000 (14:25 -0800)]
am
b6eca977: am
c22c429d: am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
b6eca977059bad80044e3c2a8b44b93d9df992bb':
Add a triangle to the popup button view
Ruben Brunk [Thu, 29 Nov 2012 22:25:50 +0000 (14:25 -0800)]
am
67109bef: am
9dd37b67: am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
67109befa39ad83b0e1f12cba6d393042d9a29e3':
Minor fix for some FP rounding errors in crop.
The Android Automerger [Thu, 29 Nov 2012 15:09:52 +0000 (07:09 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
nicolasroard [Thu, 29 Nov 2012 08:36:22 +0000 (00:36 -0800)]
am
cad5c1af: am
599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
* commit '
cad5c1afc1dc467f67f0b0b764785b6ae17b5e23':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
nicolasroard [Thu, 29 Nov 2012 08:33:55 +0000 (00:33 -0800)]
am
599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
* commit '
599393ecad6803161d5e901ef625e34cfe088009':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
nicolasroard [Thu, 29 Nov 2012 08:01:59 +0000 (00:01 -0800)]
(re-)add vertical/horizontal lines when moving Curves
Align histogram with Curves grid.
bug:
7361722
Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
Nicolas Roard [Thu, 29 Nov 2012 08:09:43 +0000 (00:09 -0800)]
am
8c592dc8: am
65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
* commit '
8c592dc805e1ed89811282d03929b6fd445b3177':
Added dashed diagonal for crop.
Nicolas Roard [Thu, 29 Nov 2012 08:06:43 +0000 (00:06 -0800)]
am
65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
* commit '
6502545991948769bc9ca725dafb9899c2635a01':
Added dashed diagonal for crop.
Nicolas Roard [Thu, 29 Nov 2012 08:04:49 +0000 (00:04 -0800)]
Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 05:52:46 +0000 (21:52 -0800)]
Added dashed diagonal for crop.
Bug:
7634466
Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
nicolasroard [Thu, 29 Nov 2012 06:30:44 +0000 (22:30 -0800)]
am
992d32d9: am
39d46790: Fix transparency issue under the spinner.
* commit '
992d32d93526b891a8ffecce8e639e49778bb884':
Fix transparency issue under the spinner.
nicolasroard [Thu, 29 Nov 2012 06:29:20 +0000 (22:29 -0800)]
am
39d46790: Fix transparency issue under the spinner.
* commit '
39d4679070caf308f04542e414fc2e3c34f9cefa':
Fix transparency issue under the spinner.
nicolasroard [Thu, 29 Nov 2012 06:24:24 +0000 (22:24 -0800)]
Fix transparency issue under the spinner.
bug:
7634701
Change-Id: I907ebbb373958350b1b17dc86723e430441a01dd
nicolasroard [Thu, 29 Nov 2012 06:20:56 +0000 (22:20 -0800)]
am
466f3d9b: am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
466f3d9b854b8206e0e543f187952c39ae253ce8':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 06:19:10 +0000 (22:19 -0800)]
am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
0a624bb8db70f1e71ca511756b886c68f32fedbe':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 06:14:20 +0000 (22:14 -0800)]
Fix potential crash
(regression introduced with fix for
7406402)
bug:
7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
nicolasroard [Thu, 29 Nov 2012 06:03:00 +0000 (22:03 -0800)]
am
33a487f6: am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
33a487f6698078a27e4a03c10f1201ee62a4dc7c':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 06:01:00 +0000 (22:01 -0800)]
am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 05:50:46 +0000 (21:50 -0800)]
Set crop ratio to unconstrained by default.
bug:
7634466
Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
nicolasroard [Thu, 29 Nov 2012 05:29:15 +0000 (21:29 -0800)]
am
83705e99: am
205d0cdf: Fix overdraw the correct way...
* commit '
83705e99a84fa941ce5dcc7488b69d55df8c7105':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 05:27:31 +0000 (21:27 -0800)]
am
205d0cdf: Fix overdraw the correct way...
* commit '
205d0cdf0590bc1156a1d7fff1d0811d142de4a6':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 05:20:37 +0000 (21:20 -0800)]
Fix overdraw the correct way...
bug:
7634701
Change-Id: Ifa7061dac35e948120c1a481c40bcf107f7ee6e1
nicolasroard [Thu, 29 Nov 2012 05:03:26 +0000 (21:03 -0800)]
am
85135c1b: am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
85135c1b580c922866965c5fb069ba69f2e76b28':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 05:02:19 +0000 (21:02 -0800)]
am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 05:01:47 +0000 (21:01 -0800)]
am
b25cb646: am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
b25cb64654eda734fef66a4706a4ee8e51e374a3':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 05:00:30 +0000 (21:00 -0800)]
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 05:00:19 +0000 (21:00 -0800)]
am
69a77e9e: am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
69a77e9e8a34806615e4a04303a65b4782473dd6':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 05:00:06 +0000 (21:00 -0800)]
am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
68e4ae64380e2c9843faaec63b98ba51479c0f11':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 04:58:35 +0000 (20:58 -0800)]
Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 04:57:56 +0000 (20:57 -0800)]
am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 04:56:31 +0000 (20:56 -0800)]
Merge "Add new borders assets" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 04:55:32 +0000 (20:55 -0800)]
am
a12b3542: am
cd84d676: Fix history panel overlap
* commit '
a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 03:31:59 +0000 (19:31 -0800)]
Add new borders assets
bug:
7386268
Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
nicolasroard [Thu, 29 Nov 2012 04:54:47 +0000 (20:54 -0800)]
am
cd84d676: Fix history panel overlap
* commit '
cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 03:59:51 +0000 (19:59 -0800)]
Fix history panel overlap
bug:
7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
nicolasroard [Thu, 29 Nov 2012 03:11:42 +0000 (19:11 -0800)]
Fix overdraw in FilterShow activity
bug:
7634701
Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
nicolasroard [Thu, 29 Nov 2012 01:46:32 +0000 (17:46 -0800)]
Fix flashing in geometry panel
bug:
7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
nicolasroard [Thu, 29 Nov 2012 01:23:58 +0000 (17:23 -0800)]
am
e4b3e7a8: am
987bc8aa: Fix wrong colors in Curves
* commit '
e4b3e7a8240ac284e33d04eac00800d3e6e96cc8':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:22:11 +0000 (17:22 -0800)]
am
987bc8aa: Fix wrong colors in Curves
* commit '
987bc8aaafa55c45451937b27d94c1d602de4d68':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:21:35 +0000 (17:21 -0800)]
am
e0a22a0b: am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
e0a22a0b12741680000b0570e0940d6602ddf003':
Fix moving points in the Curves editor
nicolasroard [Thu, 29 Nov 2012 01:20:03 +0000 (17:20 -0800)]
am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
d24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
nicolasroard [Thu, 29 Nov 2012 01:09:59 +0000 (17:09 -0800)]
Fix wrong colors in Curves
bug:
7633765
Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
nicolasroard [Thu, 29 Nov 2012 01:17:35 +0000 (17:17 -0800)]
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 01:07:17 +0000 (17:07 -0800)]
am
17b8c517: am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
17b8c5174410b09ddeb4cdd0b50468a4bbab450c':
Added locking to ImageLoader.
Ruben Brunk [Thu, 29 Nov 2012 01:05:53 +0000 (17:05 -0800)]
am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
Added locking to ImageLoader.
Ruben Brunk [Thu, 29 Nov 2012 01:04:48 +0000 (17:04 -0800)]
Merge "Added locking to ImageLoader." into gb-ub-photos-arches
John Hoford [Thu, 29 Nov 2012 00:59:42 +0000 (16:59 -0800)]
am
a8a9c933: am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
a8a9c93313ad8fa42b364e7661211a2483b9a957':
reduce size of tiny planet if malloc fails
John Hoford [Thu, 29 Nov 2012 00:57:43 +0000 (16:57 -0800)]
am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
e5b979edb369877463e07680dddd9983bd2501cb':
reduce size of tiny planet if malloc fails
John Hoford [Thu, 29 Nov 2012 00:56:20 +0000 (16:56 -0800)]
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 00:35:47 +0000 (16:35 -0800)]
Fix moving points in the Curves editor
bug:
7632994
Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
nicolasroard [Wed, 28 Nov 2012 23:59:09 +0000 (15:59 -0800)]
am
c22c429d: am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
c22c429ddebbf7f4db71ff5c0b94c7bd5f8aa63c':
Add a triangle to the popup button view
nicolasroard [Wed, 28 Nov 2012 23:57:28 +0000 (15:57 -0800)]
am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
5d2227a793b51f44f664a739cc7e931c40ba4970':
Add a triangle to the popup button view
nicolasroard [Wed, 28 Nov 2012 23:56:07 +0000 (15:56 -0800)]
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
Ruben Brunk [Fri, 16 Nov 2012 21:51:08 +0000 (13:51 -0800)]
Added locking to ImageLoader.
Bug:
7471850
Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
Ruben Brunk [Wed, 28 Nov 2012 23:48:04 +0000 (15:48 -0800)]
am
9dd37b67: am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
9dd37b67274b9ea68a06abfd0678d2fdcd596dab':
Minor fix for some FP rounding errors in crop.
Ruben Brunk [Wed, 28 Nov 2012 23:46:18 +0000 (15:46 -0800)]
am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
6a94446de01e8b6b034cc537ee3e65d507d47a47':
Minor fix for some FP rounding errors in crop.
OSDN Git Service
