OSDN Git Service
The Android Open Source Project [Tue, 11 Dec 2012 19:56:58 +0000 (11:56 -0800)]
am
2b366f1e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
2b366f1eab4d723a9bf06c616b2d23c262164939':
The Android Open Source Project [Tue, 11 Dec 2012 19:54:36 +0000 (11:54 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I59ea8b8ba720db95748416f5a44e385ff05cf024
The Android Automerger [Tue, 11 Dec 2012 03:33:49 +0000 (19:33 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Tue, 11 Dec 2012 01:27:55 +0000 (17:27 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 11 Dec 2012 01:22:59 +0000 (17:22 -0800)]
Merge "Import translations. DO NOT MERGE"
John Reck [Tue, 11 Dec 2012 00:08:12 +0000 (16:08 -0800)]
am
9745d080: am
360ae4dd: am
f6bc102c: am
695e1aa0: Force a layout pass if the display rotation changes
* commit '
9745d080caa572dd85f3e0bacd936c8ca4e2b7a6':
Force a layout pass if the display rotation changes
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
Baligh Uddin [Mon, 10 Dec 2012 16:13:29 +0000 (08:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id5189f3df0e625f8197eceeec6b58916e8d175fd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Dec 2012 16:12:25 +0000 (08:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I35011cce11ea674987e024b9376d6e2b76dd5684
Auto-generated-cl: translation import
Baligh Uddin [Thu, 6 Dec 2012 16:41:00 +0000 (08:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4067ad8b05431201a6ecda43789b843e2f3c7f74
Auto-generated-cl: translation import
Baligh Uddin [Wed, 5 Dec 2012 21:22:32 +0000 (13:22 -0800)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Wed, 5 Dec 2012 21:00:54 +0000 (13:00 -0800)]
am
7eefa322: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
7eefa3225a1fad9fdd6c133edc2dfd798df6697e':
Bobby Georgescu [Wed, 5 Dec 2012 21:00:44 +0000 (13:00 -0800)]
am
d57ddeb8: am
02a5f562: am
30c71e7c: am
db99a10b: Fix NPE in PhotoPage
* commit '
d57ddeb8fc4c157af8d423c92d9998abd47f6fd8':
Fix NPE in PhotoPage
nicolasroard [Wed, 5 Dec 2012 20:29:01 +0000 (12:29 -0800)]
am
9047063b: am
53c024ab: am
1d84ed07: am
870e62ac: Handle the case where the orientation column is not here...
* commit '
9047063b0eebcf5b0048350742de2074bc6683e4':
Handle the case where the orientation column is not here...
Michael Kolb [Wed, 5 Dec 2012 20:28:07 +0000 (12:28 -0800)]
am
b6c38277: am
b23a56f9: am
527b201b: am
7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
* commit '
b6c3827717913e877080921bd19e110cf9a2f604':
Prevent Camera UI in Gallery
nicolasroard [Wed, 5 Dec 2012 20:28:06 +0000 (12:28 -0800)]
am
8795f6bc: am
87884b28: am
a8ecc0bf: am
c6fe9f7d: Remove unneeded border asset
* commit '
8795f6bc959d9eee0ac47dbd02bfb2c5dc547e18':
Remove unneeded border asset
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
Baligh Uddin [Wed, 5 Dec 2012 17:48:51 +0000 (09:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4297d800b0b653565c20463b827c18dd7cd022dc
Auto-generated-cl: translation import
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
Baligh Uddin [Tue, 4 Dec 2012 17:18:19 +0000 (09:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3559bf7b1c0d6b29c0ea7998636cf2377fbfe274
Auto-generated-cl: translation import
Your Name [Tue, 4 Dec 2012 00:20:37 +0000 (16:20 -0800)]
am
46cb2dca: am
4f5fca2f: am
17290ae6: am
04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '
46cb2dca0b5d98a62e560da404d984f1f9f0202c':
Change themes
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
Baligh Uddin [Mon, 3 Dec 2012 16:51:44 +0000 (08:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8076bade41fae7eae91742448e24ac1c3adea0a6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 30 Nov 2012 04:53:56 +0000 (20:53 -0800)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 30 Nov 2012 04:41:08 +0000 (20:41 -0800)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Thu, 29 Nov 2012 23:44:33 +0000 (15:44 -0800)]
am
01c11f67: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
01c11f67fd31d693f00c9c5a961ca251699d233b':
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:32:17 +0000 (14:32 -0800)]
am
c6f60a98: am
ad374359: am
cad5c1af: am
599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
* commit '
c6f60a98940945bbf067c2ba8eabc6184e568b02':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
Nicolas Roard [Thu, 29 Nov 2012 22:32:16 +0000 (14:32 -0800)]
am
a1d2b77d: am
a66584f1: am
8c592dc8: am
65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
* commit '
a1d2b77dc8f9ab277e375e663e206451a8764142':
Added dashed diagonal for crop.
nicolasroard [Thu, 29 Nov 2012 22:32:15 +0000 (14:32 -0800)]
am
cf4d5b4a: am
d2a2c924: am
992d32d9: am
39d46790: Fix transparency issue under the spinner.
* commit '
cf4d5b4a9653e8fa4ba1a13a09a05d2bc5009b62':
Fix transparency issue under the spinner.
nicolasroard [Thu, 29 Nov 2012 22:32:14 +0000 (14:32 -0800)]
am
69c8dd36: am
0d9b166b: am
466f3d9b: am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
69c8dd36837b1122edfbffac02d8e6bec9bed77e':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 22:32:12 +0000 (14:32 -0800)]
am
c29939b6: am
92b91af5: am
33a487f6: am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
c29939b6160e0eb8a0b985546e22cdc1179ba768':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 22:32:11 +0000 (14:32 -0800)]
am
cf9631fb: am
39b06307: am
83705e99: am
205d0cdf: Fix overdraw the correct way...
* commit '
cf9631fb37ecd24b8ea2ad33403c40a65e9dd50a':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 22:32:10 +0000 (14:32 -0800)]
am
1d36bee9: am
188a0e33: am
85135c1b: am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
1d36bee9bff2126014d0c540bd14f18377e448e9':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 22:32:09 +0000 (14:32 -0800)]
am
1b411e07: am
170752be: am
b25cb646: am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
1b411e074fd9e5c37807c9e5d4f5a9dd1f75129a':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 22:32:07 +0000 (14:32 -0800)]
am
a5889b06: am
df4d2631: am
69a77e9e: am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
a5889b06b8a2a518eb1c152e15dd3b441896a819':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 22:32:06 +0000 (14:32 -0800)]
am
e55c5e85: am
8abe023c: am
a12b3542: am
cd84d676: Fix history panel overlap
* commit '
e55c5e8589f91002e08f8f7da67dd06db9ddab63':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 22:32:05 +0000 (14:32 -0800)]
am
7e2a30e5: am
db8647e9: am
e4b3e7a8: am
987bc8aa: Fix wrong colors in Curves
* commit '
7e2a30e5226990b621d348680656a2b7b36ac04b':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 22:32:04 +0000 (14:32 -0800)]
am
c58932e8: am
ae2408be: am
e0a22a0b: am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
c58932e82a12b650d65f95822bde386e68f4adf3':
Fix moving points in the Curves editor
Ruben Brunk [Thu, 29 Nov 2012 22:32:03 +0000 (14:32 -0800)]
am
4c758b41: am
e88e1fac: am
17b8c517: am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
4c758b4172e8bc4d8084dee0c62a4b54eb8c94da':
Added locking to ImageLoader.
John Hoford [Thu, 29 Nov 2012 22:32:01 +0000 (14:32 -0800)]
am
e6f7e0d6: am
060060d5: am
a8a9c933: am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
e6f7e0d6f0a561c1192e10bf6b50cabc9256e30b':
reduce size of tiny planet if malloc fails
nicolasroard [Thu, 29 Nov 2012 22:32:00 +0000 (14:32 -0800)]
am
78fbf02a: am
b6eca977: am
c22c429d: am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
78fbf02a187d770c1e19bdf92e5e18731007146d':
Add a triangle to the popup button view
Ruben Brunk [Thu, 29 Nov 2012 22:31:59 +0000 (14:31 -0800)]
am
cc274700: am
67109bef: am
9dd37b67: am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
cc2747005e23814c70eb3d6b4c5970498fd601bb':
Minor fix for some FP rounding errors in crop.
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.
Baligh Uddin [Thu, 29 Nov 2012 16:09:53 +0000 (08:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I50c68b01eae38eb21d9ec8696485470816951e26
Auto-generated-cl: translation import
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
Baligh Uddin [Thu, 29 Nov 2012 15:03:32 +0000 (07:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia638d7a19b2b2f56f004fb4dc07929db76132509
Auto-generated-cl: translation import
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
OSDN Git Service
