git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

John Reck [Fri, 26 Oct 2012 17:08:17 +0000 (10:08 -0700)]

am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '38e64b25801cbec5004cd67ce22ebb6ca822bef1':
Add proxy launcher

commit | commitdiff | tree

John Reck [Fri, 26 Oct 2012 17:04:45 +0000 (10:04 -0700)]

am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '10f975a628badbb400a97872c6704740ef936e46':
Add proxy launcher

commit | commitdiff | tree

John Reck [Fri, 26 Oct 2012 17:03:05 +0000 (10:03 -0700)]

Merge "Add proxy launcher" into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Fri, 26 Oct 2012 12:46:15 +0000 (05:46 -0700)]

am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

* commit 'd58b942aaa15a8c1a3663329f8a4d2d275aed4a6':
Hold WakeLock for batch delete operation

commit | commitdiff | tree

Bobby Georgescu [Fri, 26 Oct 2012 12:01:07 +0000 (05:01 -0700)]

am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

* commit '798f4a914d47e69496374051fab386a3536c9698':
Hold WakeLock for batch delete operation

commit | commitdiff | tree

Bobby Georgescu [Fri, 26 Oct 2012 11:59:23 +0000 (04:59 -0700)]

Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Fri, 26 Oct 2012 07:55:01 +0000 (00:55 -0700)]

am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror

* commit '8fe5c7542d1de4e02c027318866ab2a2b020b94d':
Fix colors in rotate and mirror

commit | commitdiff | tree

nicolasroard [Fri, 26 Oct 2012 07:52:54 +0000 (00:52 -0700)]

am 8d8cdf7f: Fix colors in rotate and mirror

* commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0':
Fix colors in rotate and mirror

commit | commitdiff | tree

nicolasroard [Fri, 26 Oct 2012 07:02:18 +0000 (00:02 -0700)]

Fix colors in rotate and mirror

bug:7419025
Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600

commit | commitdiff | tree

nicolasroard [Fri, 26 Oct 2012 06:43:31 +0000 (23:43 -0700)]

am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit '7dcaeec6ef5841107f5b42990c5d9d56ddbb251f':
Fix crash when showing history

commit | commitdiff | tree

nicolasroard [Fri, 26 Oct 2012 06:42:14 +0000 (23:42 -0700)]

am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit '8b3ce9b01275151b653ea138324e47eb66a7b47e':
Fix crash when showing history

commit | commitdiff | tree

nicolasroard [Fri, 26 Oct 2012 06:41:00 +0000 (23:41 -0700)]

Merge "Fix crash when showing history" into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Fri, 26 Oct 2012 06:27:32 +0000 (23:27 -0700)]

Fix crash when showing history

bug:7418823
Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7

commit | commitdiff | tree

Hung-ying Tyan [Fri, 26 Oct 2012 04:20:40 +0000 (21:20 -0700)]

am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit '45dfd43eb36bad916cee573e8822008d12d2fdc6':
Fix tiling effect when open a photo.

commit | commitdiff | tree

Hung-ying Tyan [Fri, 26 Oct 2012 04:18:46 +0000 (21:18 -0700)]

am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit '635aab5631e25488610ff5546c51ea2895dda2f0':
Fix tiling effect when open a photo.

commit | commitdiff | tree

Hung-ying Tyan [Fri, 26 Oct 2012 04:17:12 +0000 (21:17 -0700)]

Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

commit | commitdiff | tree

Nicolas Roard [Fri, 26 Oct 2012 02:24:36 +0000 (19:24 -0700)]

am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit '7849722053ed8f154a83f41b7fec067b4e2a9864':
Do not add crop into preset if in inital setup

commit | commitdiff | tree

Nicolas Roard [Fri, 26 Oct 2012 02:23:20 +0000 (19:23 -0700)]

am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit '24f28850adcb14a1de87e538f60f3bb309bed284':
Do not add crop into preset if in inital setup

commit | commitdiff | tree

Nicolas Roard [Fri, 26 Oct 2012 02:21:45 +0000 (19:21 -0700)]

Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Thu, 25 Oct 2012 21:55:55 +0000 (14:55 -0700)]

Hold WakeLock for batch delete operation

Bug: 6680729
Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a

commit | commitdiff | tree

John Hoford [Fri, 26 Oct 2012 01:38:51 +0000 (18:38 -0700)]

Do not add crop into preset if in inital setup

bug:7417545
Change-Id: I355936645e555e3d6b950923af301b437570dd93

commit | commitdiff | tree

John Reck [Wed, 24 Oct 2012 18:11:51 +0000 (11:11 -0700)]

Add proxy launcher

Bug: 7394901

Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c

commit | commitdiff | tree

John Reck [Fri, 26 Oct 2012 00:51:52 +0000 (17:51 -0700)]

am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit 'c62b066a240a17f0b99a65bfb9eb8210f8407e6e':
Add loading spinner

commit | commitdiff | tree

John Reck [Fri, 26 Oct 2012 00:50:45 +0000 (17:50 -0700)]

am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit '6106c833161cf8e64fc6a9580116f11f4a02d98b':
Add loading spinner

commit | commitdiff | tree

Mangesh Ghiware [Fri, 26 Oct 2012 00:50:21 +0000 (17:50 -0700)]

am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit 'dd7139babe7b1ae3893d329652f3efcab77652f0':
Handle 360 panorama specific MIME type.

commit | commitdiff | tree

John Reck [Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)]

Merge "Add loading spinner" into gb-ub-photos-arches

commit | commitdiff | tree

Mangesh Ghiware [Fri, 26 Oct 2012 00:47:30 +0000 (17:47 -0700)]

am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit '5388677d3078f2c218d22465c955e3df6b2ffbed':
Handle 360 panorama specific MIME type.

commit | commitdiff | tree

Mangesh Ghiware [Fri, 26 Oct 2012 00:44:54 +0000 (17:44 -0700)]

Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

commit | commitdiff | tree

John Reck [Thu, 25 Oct 2012 17:08:37 +0000 (10:08 -0700)]

Add loading spinner

Bug: 7408575

Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9

commit | commitdiff | tree

Mangesh Ghiware [Wed, 10 Oct 2012 22:56:29 +0000 (15:56 -0700)]

Handle 360 panorama specific MIME type.

Bug: 7407448

Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef

commit | commitdiff | tree

Ruben Brunk [Fri, 26 Oct 2012 00:02:15 +0000 (17:02 -0700)]

am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit 'bdd21912a4365a703716b16a636832f71c4c0d0c':
Fix issue where aspect bounds don't get applied.

commit | commitdiff | tree

Ruben Brunk [Fri, 26 Oct 2012 00:02:14 +0000 (17:02 -0700)]

am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit '812d65bd1d8c30bdb0f174d2503e0042ac59b13c':
Fixed crop intent.

commit | commitdiff | tree

Ruben Brunk [Fri, 26 Oct 2012 00:00:58 +0000 (17:00 -0700)]

am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit '4164fabf5f9324adde9954130aad13c2f72aa24a':
Fix issue where aspect bounds don't get applied.

commit | commitdiff | tree

Ruben Brunk [Fri, 26 Oct 2012 00:00:57 +0000 (17:00 -0700)]

am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit 'd72971e683069d463c78117037414e5286689549':
Fixed crop intent.

commit | commitdiff | tree

Ruben Brunk [Fri, 26 Oct 2012 00:00:20 +0000 (17:00 -0700)]

Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 23:59:41 +0000 (16:59 -0700)]

Merge "Fixed crop intent." into gb-ub-photos-arches

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 01:24:34 +0000 (18:24 -0700)]

Fix issue where aspect bounds don't get applied.

Bug: 7407937
Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 22:53:42 +0000 (15:53 -0700)]

Fixed crop intent.

Bug: 7415140
Bug: 7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 22:16:04 +0000 (15:16 -0700)]

am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

* commit '1ff4d0fd3d6ca600a92ca939aab34a3ff11dc414':
Tagged strings in XML with translation info.

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 22:11:16 +0000 (15:11 -0700)]

am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

* commit '15aff7c3b27e2938cea3734cb350671386d210c7':
Tagged strings in XML with translation info.

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 22:09:23 +0000 (15:09 -0700)]

Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 20:24:50 +0000 (13:24 -0700)]

am f38cb998: Fix conflict with other build fix

* commit 'f38cb998d6d35ce31a7aa446073e8488305812c2':
Fix conflict with other build fix

commit | commitdiff | tree

Bobby Georgescu [Thu, 25 Oct 2012 20:17:43 +0000 (13:17 -0700)]

am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches

* commit 'd43a8f94375e899a4b2a544552875c1b0d8b48f4':
Get rid of black lines near edge of thumbnails

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 20:17:33 +0000 (13:17 -0700)]

Fix conflict with other build fix

Change-Id: Id5286ee8d335b6307f6602e933364f462f19bff2

commit | commitdiff | tree

Bobby Georgescu [Thu, 25 Oct 2012 20:16:18 +0000 (13:16 -0700)]

am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f':
Get rid of black lines near edge of thumbnails

commit | commitdiff | tree

Bobby Georgescu [Thu, 25 Oct 2012 20:14:50 +0000 (13:14 -0700)]

Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 19:32:58 +0000 (12:32 -0700)]

am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit 'a31708cf4587c607162c9b22e13792cbe354a777':
Fix build.

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 19:30:55 +0000 (12:30 -0700)]

am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit '0c7e8aac441c18117b8daf3255d2658b83a37bde':
Fix build.

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 19:28:28 +0000 (12:28 -0700)]

Merge "Fix build." into gb-ub-photos-arches

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 19:28:17 +0000 (12:28 -0700)]

am 17c550d3: Merge "Fix build" into jb-mr1-dev

* commit '17c550d3dddafa0b501dbce294db3e1c18de26df':
Fix build

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)]

Merge "Fix build" into jb-mr1-dev

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 19:21:48 +0000 (12:21 -0700)]

am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor

* commit 'a36cc0eb13e14b02bb7df53c7343d73ba33e3c8e':
Fix crash when starting filtereditor

commit | commitdiff | tree

Angus Kong [Thu, 25 Oct 2012 19:21:23 +0000 (03:21 +0800)]

Fix build.

Change-Id: Ia7b581eba32f98d695117526d25876e7a8a398c0

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 19:19:42 +0000 (12:19 -0700)]

am 8bc296e2: Fix crash when starting filtereditor

* commit '8bc296e233298dbc76da22f01aaffec11e539d19':
Fix crash when starting filtereditor

commit | commitdiff | tree

Michael Jurka [Thu, 25 Oct 2012 19:14:38 +0000 (12:14 -0700)]

Fix build

Change-Id: Ic8ff27ff1bc0953a81deab631c268c74324e6415

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 19:03:54 +0000 (12:03 -0700)]

Tagged strings in XML with translation info.

Bug: 7403813
Change-Id: Iff1ec505c2c6fbfc11f7f472cc2e67430cf3715d

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 18:54:57 +0000 (11:54 -0700)]

Fix crash when starting filtereditor

bug:7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8

commit | commitdiff | tree

Bobby Georgescu [Thu, 25 Oct 2012 18:54:39 +0000 (11:54 -0700)]

Get rid of black lines near edge of thumbnails

Bug: 7414307
Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa

commit | commitdiff | tree

Angus Kong [Thu, 25 Oct 2012 18:28:30 +0000 (11:28 -0700)]

am c6b77275: am 71c17775: Force renderring request for Camera Animation.

* commit 'c6b77275bde572b8ecd47449e6b1b7c4d4c516ab':
Force renderring request for Camera Animation.

commit | commitdiff | tree

Angus Kong [Thu, 25 Oct 2012 18:26:10 +0000 (11:26 -0700)]

am 71c17775: Force renderring request for Camera Animation.

* commit '71c177759c7aa10082c8fdf909b701cf0047bead':
Force renderring request for Camera Animation.

commit | commitdiff | tree

Angus Kong [Thu, 25 Oct 2012 12:08:14 +0000 (20:08 +0800)]

Force renderring request for Camera Animation.

bug:7410862
Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 05:46:12 +0000 (22:46 -0700)]

am dff8cf82: am dffe6a6f: Fix default for tiny planet

* commit 'dff8cf82d1156f38bf7338ac37b1571597ae3f68':
Fix default for tiny planet

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 05:44:13 +0000 (22:44 -0700)]

am dffe6a6f: Fix default for tiny planet

* commit 'dffe6a6f8bbf4565df211b07bcfc23d6864a48b6':
Fix default for tiny planet

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 05:06:07 +0000 (22:06 -0700)]

am 73a2ad06: am e7a71372: Fix update view

* commit '73a2ad06d3ac5456f0ada8f913dabf505d26fb8d':
Fix update view

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 05:03:55 +0000 (22:03 -0700)]

am e7a71372: Fix update view

* commit 'e7a71372747af0ef03f9d953c28ed62de58315d3':
Fix update view

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 05:02:40 +0000 (22:02 -0700)]

Fix default for tiny planet

bug:7410938
Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 04:50:24 +0000 (21:50 -0700)]

Fix update view

bug:7410583
Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646

commit | commitdiff | tree

Owen Lin [Wed, 24 Oct 2012 12:35:45 +0000 (20:35 +0800)]

Fix tiling effect when open a photo.

1. Don't draw the tiles of full image before screen nail is ready.
2. Upload multiple tiles in each frame in order to show photo quickly.

bug: 7403409

Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 04:15:46 +0000 (21:15 -0700)]

am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'd4c93190e5aab69cfee9cfa8218bc4c126f7f48d':
Remove the old photo editor

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 04:13:27 +0000 (21:13 -0700)]

am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7':
Remove the old photo editor

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 04:11:06 +0000 (21:11 -0700)]

Merge "Remove the old photo editor" into gb-ub-photos-arches

commit | commitdiff | tree

Sascha Haeberling [Thu, 25 Oct 2012 03:08:36 +0000 (20:08 -0700)]

am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

* commit '2df8a18abd1b23728052527d765a57e03abf093d':
Fixes TinyPlanet crashed due to too excessive memory usage.

commit | commitdiff | tree

Sascha Haeberling [Thu, 25 Oct 2012 03:06:38 +0000 (20:06 -0700)]

am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

* commit 'b13e1788ddf886fcdfd1ec837a59ec242bb33dae':
Fixes TinyPlanet crashed due to too excessive memory usage.

commit | commitdiff | tree

Sascha Haeberling [Thu, 25 Oct 2012 03:04:48 +0000 (20:04 -0700)]

Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 02:41:45 +0000 (19:41 -0700)]

am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

* commit 'e1de865ca29bd178024a952efb2e1b9b54185336':
Fixed blackscreen when launching crop from menu.

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 02:39:17 +0000 (19:39 -0700)]

am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

* commit '4a601448dff06711df2d08e75d4b0c43aa57600e':
Fixed blackscreen when launching crop from menu.

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 02:37:52 +0000 (19:37 -0700)]

Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

commit | commitdiff | tree

Ruben Brunk [Thu, 25 Oct 2012 02:09:09 +0000 (19:09 -0700)]

Fixed blackscreen when launching crop from menu.

Bug: 7410287
Change-Id: I60ae95cff82c789df37ce1b45fbaaaffa1aa552b

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 01:42:59 +0000 (18:42 -0700)]

am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view

* commit 'dd12e5b57cef40711cb2c5201589a2a48e521080':
Add rotation to tinyplanet view

commit | commitdiff | tree

Sascha Haeberling [Thu, 25 Oct 2012 01:35:37 +0000 (18:35 -0700)]

Fixes TinyPlanet crashed due to too excessive memory usage.

Bug: 7409664

Change-Id: If82882ce7186500f5a3af769d490275233a6191c

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 01:39:47 +0000 (18:39 -0700)]

am 2c6ea941: Add rotation to tinyplanet view

* commit '2c6ea941a80ea22317d664e329aed51f5f7417b9':
Add rotation to tinyplanet view

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 00:55:51 +0000 (17:55 -0700)]

Remove the old photo editor

bug:7407573
Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c
(cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 00:47:12 +0000 (17:47 -0700)]

Add rotation to tinyplanet view

bug:7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 00:30:50 +0000 (17:30 -0700)]

am 6bedee87: am 7592704e: Fixes UI stuff

* commit '6bedee874b8be3a3d121c8cd555d0fda9d6eea98':
Fixes UI stuff

commit | commitdiff | tree

nicolasroard [Thu, 25 Oct 2012 00:28:55 +0000 (17:28 -0700)]

am 7592704e: Fixes UI stuff

* commit '7592704e662e49e4bbf3ba86a43d790774829bb0':
Fixes UI stuff

commit | commitdiff | tree

nicolasroard [Wed, 24 Oct 2012 23:39:41 +0000 (16:39 -0700)]

Fixes UI stuff

bug:7393871
bug:7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f

commit | commitdiff | tree

Teng-Hui Zhu [Wed, 24 Oct 2012 23:39:20 +0000 (16:39 -0700)]

am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches

* commit '5122c99a4af38167c58e0059c4dbe947a64536bf':
Initialize the modified date correctly.

commit | commitdiff | tree

Teng-Hui Zhu [Wed, 24 Oct 2012 23:36:26 +0000 (16:36 -0700)]

am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches

* commit 'ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290':
Initialize the modified date correctly.

commit | commitdiff | tree

Teng-Hui Zhu [Wed, 24 Oct 2012 23:33:47 +0000 (16:33 -0700)]

Merge "Initialize the modified date correctly." into gb-ub-photos-arches

commit | commitdiff | tree

nicolasroard [Wed, 24 Oct 2012 22:57:12 +0000 (15:57 -0700)]

am 6cea6759: am 0a23b42e: Change background and panel colors

* commit '6cea6759d2919b8491aeb9105e6d1484b1b0006b':
Change background and panel colors

commit | commitdiff | tree

nicolasroard [Wed, 24 Oct 2012 22:54:46 +0000 (15:54 -0700)]

am 0a23b42e: Change background and panel colors

* commit '0a23b42e4a3e3a93ce7389bfb7352944f644add6':
Change background and panel colors

commit | commitdiff | tree

nicolasroard [Wed, 24 Oct 2012 22:43:56 +0000 (15:43 -0700)]

Change background and panel colors

bug:7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4

commit | commitdiff | tree

Teng-Hui Zhu [Wed, 24 Oct 2012 22:08:59 +0000 (15:08 -0700)]

Initialize the modified date correctly.

On top of that, the date_taken is in units of seconds, while others are in
units of milliseconds.

bug:7307090

Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1

commit | commitdiff | tree

Bobby Georgescu [Wed, 24 Oct 2012 21:28:14 +0000 (14:28 -0700)]

am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

* commit 'baffd018fcd262c2cda1fa275c0d0236826be681':
Fix attempted uploading of recycled tiles

commit | commitdiff | tree

Bobby Georgescu [Wed, 24 Oct 2012 21:27:06 +0000 (14:27 -0700)]

am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

* commit '86282c8860edfec0df5c28d22d52aa4b59112d55':
Fix attempted uploading of recycled tiles

commit | commitdiff | tree

Bobby Georgescu [Wed, 24 Oct 2012 21:25:38 +0000 (14:25 -0700)]

Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

commit | commitdiff | tree

John Reck [Wed, 24 Oct 2012 21:23:46 +0000 (14:23 -0700)]

am 1376c4dc: am d49d5320: Move loadBitmap to async task

* commit '1376c4dc718548d724bc0dafdae8c9d1524118d6':
Move loadBitmap to async task

commit | commitdiff | tree

John Reck [Wed, 24 Oct 2012 21:21:55 +0000 (14:21 -0700)]

am d49d5320: Move loadBitmap to async task

* commit 'd49d53206a197b08ec4754d8751b6860e33d9f48':
Move loadBitmap to async task

commit | commitdiff | tree

Bobby Georgescu [Wed, 24 Oct 2012 21:15:38 +0000 (14:15 -0700)]

Fix attempted uploading of recycled tiles

Bug: 7405398
Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548

commit | commitdiff | tree

John Reck [Wed, 24 Oct 2012 19:56:31 +0000 (12:56 -0700)]

Move loadBitmap to async task

Bug: 7406705

Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a