OSDN Git Service
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.
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.
Michael Jurka [Thu, 25 Oct 2012 19:28:28 +0000 (12:28 -0700)]
Merge "Fix build." into gb-ub-photos-arches
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
Michael Jurka [Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)]
Merge "Fix build" into jb-mr1-dev
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
Angus Kong [Thu, 25 Oct 2012 19:21:23 +0000 (03:21 +0800)]
Fix build.
Change-Id: Ia7b581eba32f98d695117526d25876e7a8a398c0
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
Michael Jurka [Thu, 25 Oct 2012 19:14:38 +0000 (12:14 -0700)]
Fix build
Change-Id: Ic8ff27ff1bc0953a81deab631c268c74324e6415
nicolasroard [Thu, 25 Oct 2012 18:54:57 +0000 (11:54 -0700)]
Fix crash when starting filtereditor
bug:
7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
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.
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.
Angus Kong [Thu, 25 Oct 2012 12:08:14 +0000 (20:08 +0800)]
Force renderring request for Camera Animation.
bug:
7410862
Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
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
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
nicolasroard [Thu, 25 Oct 2012 05:06:07 +0000 (22:06 -0700)]
nicolasroard [Thu, 25 Oct 2012 05:03:55 +0000 (22:03 -0700)]
am
e7a71372: Fix update view
* commit '
e7a71372747af0ef03f9d953c28ed62de58315d3':
Fix update view
nicolasroard [Thu, 25 Oct 2012 05:02:40 +0000 (22:02 -0700)]
Fix default for tiny planet
bug:
7410938
Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd
nicolasroard [Thu, 25 Oct 2012 04:50:24 +0000 (21:50 -0700)]
Fix update view
bug:
7410583
Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646
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
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
nicolasroard [Thu, 25 Oct 2012 04:11:06 +0000 (21:11 -0700)]
Merge "Remove the old photo editor" into gb-ub-photos-arches
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.
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.
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
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.
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.
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
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
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
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
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
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)
nicolasroard [Thu, 25 Oct 2012 00:47:12 +0000 (17:47 -0700)]
Add rotation to tinyplanet view
bug:
7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
nicolasroard [Thu, 25 Oct 2012 00:30:50 +0000 (17:30 -0700)]
nicolasroard [Thu, 25 Oct 2012 00:28:55 +0000 (17:28 -0700)]
nicolasroard [Wed, 24 Oct 2012 23:39:41 +0000 (16:39 -0700)]
Fixes UI stuff
bug:
7393871
bug:
7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
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.
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.
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
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
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
nicolasroard [Wed, 24 Oct 2012 22:43:56 +0000 (15:43 -0700)]
Change background and panel colors
bug:
7385980
Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
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
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
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
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
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
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
Bobby Georgescu [Wed, 24 Oct 2012 21:15:38 +0000 (14:15 -0700)]
Fix attempted uploading of recycled tiles
Bug:
7405398
Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
John Reck [Wed, 24 Oct 2012 19:56:31 +0000 (12:56 -0700)]
Move loadBitmap to async task
Bug:
7406705
Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a
Bobby Georgescu [Wed, 24 Oct 2012 20:55:32 +0000 (13:55 -0700)]
am
f77721af: am
5bd00332: Launch built-in camera app via filmstrip
* commit '
f77721afef7b839df36f151604e014130c1971f8':
Launch built-in camera app via filmstrip
Bobby Georgescu [Wed, 24 Oct 2012 20:53:26 +0000 (13:53 -0700)]
am
5bd00332: Launch built-in camera app via filmstrip
* commit '
5bd00332556b20c141b5c7f16433d55b1bc7fe0f':
Launch built-in camera app via filmstrip
Bobby Georgescu [Wed, 24 Oct 2012 19:09:38 +0000 (12:09 -0700)]
Launch built-in camera app via filmstrip
Bug:
7407182
Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
Ruben Brunk [Wed, 24 Oct 2012 18:52:18 +0000 (11:52 -0700)]
am
cc33fd6d: am
eb6a24e1: Took out aspect ratio switching.
* commit '
cc33fd6dac2e58707f13ff66ee04cf3489bd50a9':
Took out aspect ratio switching.
Ruben Brunk [Wed, 24 Oct 2012 18:50:36 +0000 (11:50 -0700)]
am
eb6a24e1: Took out aspect ratio switching.
* commit '
eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9':
Took out aspect ratio switching.
Ruben Brunk [Wed, 24 Oct 2012 18:05:45 +0000 (11:05 -0700)]
Took out aspect ratio switching.
Bug:
7406414
Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
nicolasroard [Wed, 24 Oct 2012 18:40:44 +0000 (11:40 -0700)]
am
2281b682: am
ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
* commit '
2281b682c459a978391a8cbf54e8944ea4937f40':
Save the image when applying tiny planet
nicolasroard [Wed, 24 Oct 2012 18:39:17 +0000 (11:39 -0700)]
am
ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
* commit '
ca05711f0e6f788f0e2937fef04599d612911ca6':
Save the image when applying tiny planet
nicolasroard [Wed, 24 Oct 2012 18:38:24 +0000 (11:38 -0700)]
Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
nicolasroard [Wed, 24 Oct 2012 18:31:57 +0000 (11:31 -0700)]
Save the image when applying tiny planet
bug:
7403622
Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16
John Hoford [Wed, 24 Oct 2012 18:18:45 +0000 (11:18 -0700)]
am
0b8c1459: am
de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
* commit '
0b8c14595e65bfbd62be49af2ea631308a10d2d7':
limited the size of textures to 2048
John Hoford [Wed, 24 Oct 2012 18:17:00 +0000 (11:17 -0700)]
am
de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
* commit '
de00ad0d02f4e328b93a1f5aa393dadf6e685033':
limited the size of textures to 2048
John Hoford [Wed, 24 Oct 2012 18:15:49 +0000 (11:15 -0700)]
Merge "limited the size of textures to 2048" into gb-ub-photos-arches
John Hoford [Wed, 24 Oct 2012 18:08:01 +0000 (11:08 -0700)]
limited the size of textures to 2048
bug:
7404007
Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
Bobby Georgescu [Wed, 24 Oct 2012 18:01:00 +0000 (11:01 -0700)]
am
a0d84367: am
a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
* commit '
a0d8436738e4d13b4fdbbe245c126ff33e410857':
Do not show bottom controls when undo bar is visible
Baligh Uddin [Wed, 24 Oct 2012 18:00:58 +0000 (11:00 -0700)]
am
b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b48c872ee2f274031f5e6e7132ad9ee661458c05':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 18:00:57 +0000 (11:00 -0700)]
am
5116f2fd: (-s ours) am
a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
5116f2fd5ae9182e76231dab90a4f116f6d9bcf7':
Import translations. DO NOT MERGE
Bobby Georgescu [Wed, 24 Oct 2012 18:00:53 +0000 (11:00 -0700)]
am
51881e02: am
f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
* commit '
51881e022f428a061188ecb33cc853d31dfb48d1':
Do not show Camera placeholder when not appropriate
Owen Lin [Wed, 24 Oct 2012 18:00:39 +0000 (11:00 -0700)]
am
f3958f87: am
adee31f0: Use TiledTexture for thumbnails.
* commit '
f3958f87ddd1bd040ab50dea72280df95a4811f1':
Use TiledTexture for thumbnails.
Sascha Haeberling [Wed, 24 Oct 2012 18:00:25 +0000 (11:00 -0700)]
am
b682706f: am
c60752b2: Use XMP meta-data for correct tiny planets.
* commit '
b682706f542e7f43e189a1e608446d5440dea860':
Use XMP meta-data for correct tiny planets.
Ruben Brunk [Wed, 24 Oct 2012 18:00:22 +0000 (11:00 -0700)]
am
1d866031: am
eb75699b: Fixed scaling factor for ImageShow and rotations.
* commit '
1d86603133491fcc0e96eaa38b14da18161857dc':
Fixed scaling factor for ImageShow and rotations.
Ruben Brunk [Wed, 24 Oct 2012 17:59:58 +0000 (10:59 -0700)]
am
5a093c66: am
3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
* commit '
5a093c66b71b00a2a70da104d94667a8080e9464':
Fix so mirror gets applied.
Nicolas Roard [Wed, 24 Oct 2012 17:59:57 +0000 (10:59 -0700)]
am
842257ca: am
d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
* commit '
842257ca6aa393a1674d6a88674a28336c6ac63c':
Support XMP data, fixed read file on another thread
Doris Liu [Wed, 24 Oct 2012 17:59:52 +0000 (10:59 -0700)]
am
413c7109: am
5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
* commit '
413c7109c24b7db173032872c5b2e4cd2347d387':
Stay in AlbumPage when dismissing a popup from AP
Ruben Brunk [Wed, 24 Oct 2012 17:59:45 +0000 (10:59 -0700)]
am
c3a48597: am
f46da69a: Increased touch tolerance in cropping.
* commit '
c3a485975fbcf3e1dd81016830a7fa209acb1d7d':
Increased touch tolerance in cropping.
Bobby Georgescu [Wed, 24 Oct 2012 16:56:33 +0000 (09:56 -0700)]
am
a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
* commit '
a1d04a4aef8117fa0c98b34a931a18a7b46073e3':
Do not show bottom controls when undo bar is visible
Bobby Georgescu [Wed, 24 Oct 2012 16:54:02 +0000 (09:54 -0700)]
Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
Baligh Uddin [Wed, 24 Oct 2012 16:46:18 +0000 (09:46 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 24 Oct 2012 16:44:08 +0000 (09:44 -0700)]
am
a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
a4e538e06ec0d3be8747babb1cc78ceb61fe1b10':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 16:42:04 +0000 (09:42 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Wed, 24 Oct 2012 03:52:26 +0000 (20:52 -0700)]
Do not show bottom controls when undo bar is visible
Bug:
7403458
Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
Bobby Georgescu [Wed, 24 Oct 2012 16:17:42 +0000 (09:17 -0700)]
am
f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
* commit '
f4a732646e9a4bf6f1f02b4eac0147adca4287c9':
Do not show Camera placeholder when not appropriate
Bobby Georgescu [Wed, 24 Oct 2012 16:15:52 +0000 (09:15 -0700)]
Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
Baligh Uddin [Wed, 24 Oct 2012 15:19:59 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1036d0f81dccdc5eaaaa7d48ff8f84d8fb56d4c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Oct 2012 15:19:22 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea10dde43aa1a898cd822284d4256f3dfc80a3a4
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Oct 2012 15:17:26 +0000 (08:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3411341031dc267cb2ee4ccc665e5598504d69c4
Auto-generated-cl: translation import
Owen Lin [Wed, 24 Oct 2012 08:33:16 +0000 (01:33 -0700)]
am
adee31f0: Use TiledTexture for thumbnails.
* commit '
adee31f028d839e7baa8f9e052dc4e4d60b137da':
Use TiledTexture for thumbnails.
Owen Lin [Tue, 23 Oct 2012 04:41:23 +0000 (12:41 +0800)]
Use TiledTexture for thumbnails.
1. Use TiledTexture for thumbnails to prevent jank in uploading big
thumbnails. (e.g., 512 * 512)
2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5).
bug:
7381302
Change-Id: I7661d648373e893b40b2a0304037171760091e00
Sascha Haeberling [Wed, 24 Oct 2012 05:47:40 +0000 (22:47 -0700)]
am
c60752b2: Use XMP meta-data for correct tiny planets.
* commit '
c60752b28bcdc859b24040f77883568e0838ed74':
Use XMP meta-data for correct tiny planets.
Sascha Haeberling [Wed, 24 Oct 2012 05:34:21 +0000 (22:34 -0700)]
Use XMP meta-data for correct tiny planets.
Bug:
7403766
Change-Id: Ie03d40d0396d352d6fe48c91b995a2f872c98a06
Ruben Brunk [Wed, 24 Oct 2012 05:12:05 +0000 (22:12 -0700)]
am
eb75699b: Fixed scaling factor for ImageShow and rotations.
* commit '
eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389':
Fixed scaling factor for ImageShow and rotations.
Ruben Brunk [Wed, 24 Oct 2012 01:11:10 +0000 (18:11 -0700)]
Fixed scaling factor for ImageShow and rotations.
Bug:
7392240
Bug:
7386048
Change-Id: I156c52acbd041604df2f7ccacca3a80f1b9fdb3b
Bobby Georgescu [Wed, 24 Oct 2012 03:29:57 +0000 (20:29 -0700)]
Do not show Camera placeholder when not appropriate
Bug:
7403454
Change-Id: I5cc0227f068da0ca596e6259314b9d2ade62de07
Ruben Brunk [Wed, 24 Oct 2012 02:43:38 +0000 (19:43 -0700)]
am
3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
* commit '
3fb2007892a436f704dc168c0549a6c8ee201e4a':
Fix so mirror gets applied.
Nicolas Roard [Wed, 24 Oct 2012 02:43:37 +0000 (19:43 -0700)]
am
d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
* commit '
d3aebee7b35ff969fce3607a5c051d607ca42ec7':
Support XMP data, fixed read file on another thread
Ruben Brunk [Wed, 24 Oct 2012 02:42:12 +0000 (19:42 -0700)]
Merge "Fix so mirror gets applied." into gb-ub-photos-arches
Nicolas Roard [Wed, 24 Oct 2012 02:40:46 +0000 (19:40 -0700)]
Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
Ruben Brunk [Wed, 24 Oct 2012 02:30:00 +0000 (19:30 -0700)]
Fix so mirror gets applied.
Bug:
7402773
Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
Doris Liu [Wed, 24 Oct 2012 01:55:23 +0000 (18:55 -0700)]
am
5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
* commit '
5d3e665359272f8b7b379461ede24918d6b4537e':
Stay in AlbumPage when dismissing a popup from AP