OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
Bobby Georgescu [Fri, 26 Oct 2012 12:01:00 +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

11 years agoMerge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
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

11 years agoam 8d8cdf7f: Fix colors in rotate and mirror
nicolasroard [Fri, 26 Oct 2012 07:53:22 +0000 (00:53 -0700)]
am 8d8cdf7f: Fix colors in rotate and mirror

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

11 years agoFix colors in rotate and mirror
nicolasroard [Fri, 26 Oct 2012 07:02:18 +0000 (00:02 -0700)]
Fix colors in rotate and mirror

bug:7419025
Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600

11 years agoam 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches
nicolasroard [Fri, 26 Oct 2012 06:42:41 +0000 (23:42 -0700)]
am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

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

11 years agoMerge "Fix crash when showing history" into gb-ub-photos-arches
nicolasroard [Fri, 26 Oct 2012 06:41:00 +0000 (23:41 -0700)]
Merge "Fix crash when showing history" into gb-ub-photos-arches

11 years agoFix crash when showing history
nicolasroard [Fri, 26 Oct 2012 06:27:32 +0000 (23:27 -0700)]
Fix crash when showing history

bug:7418823
Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7

11 years agoam 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
Hung-ying Tyan [Fri, 26 Oct 2012 04:19:11 +0000 (21:19 -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.

11 years agoMerge "Fix tiling effect when open a photo." into gb-ub-photos-arches
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

11 years agoam 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos...
Nicolas Roard [Fri, 26 Oct 2012 02:23:45 +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

11 years agoMerge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
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

11 years agoHold WakeLock for batch delete operation
Bobby Georgescu [Thu, 25 Oct 2012 21:55:55 +0000 (14:55 -0700)]
Hold WakeLock for batch delete operation

Bug: 6680729
Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a

11 years agoDo not add crop into preset if in inital setup
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

11 years agoam 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 00:51:05 +0000 (17:51 -0700)]
am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit '6106c833161cf8e64fc6a9580116f11f4a02d98b':
  Add loading spinner

11 years agoMerge "Add loading spinner" into gb-ub-photos-arches
John Reck [Fri, 26 Oct 2012 00:49:27 +0000 (17:49 -0700)]
Merge "Add loading spinner" into gb-ub-photos-arches

11 years agoam 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
Mangesh Ghiware [Fri, 26 Oct 2012 00:46:49 +0000 (17:46 -0700)]
am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

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

11 years agoMerge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
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

11 years agoAdd loading spinner
John Reck [Thu, 25 Oct 2012 17:08:37 +0000 (10:08 -0700)]
Add loading spinner

 Bug: 7408575

Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9

11 years agoHandle 360 panorama specific MIME type.
Mangesh Ghiware [Wed, 10 Oct 2012 22:56:29 +0000 (15:56 -0700)]
Handle 360 panorama specific MIME type.

Bug: 7407448

Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef

11 years agoam 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub...
Ruben Brunk [Fri, 26 Oct 2012 00:01:16 +0000 (17:01 -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.

11 years agoam d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
Ruben Brunk [Fri, 26 Oct 2012 00:01:13 +0000 (17:01 -0700)]
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit 'd72971e683069d463c78117037414e5286689549':
  Fixed crop intent.

11 years agoMerge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
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

11 years agoMerge "Fixed crop intent." into gb-ub-photos-arches
Ruben Brunk [Thu, 25 Oct 2012 23:59:41 +0000 (16:59 -0700)]
Merge "Fixed crop intent." into gb-ub-photos-arches

11 years agoFix issue where aspect bounds don't get applied.
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

11 years agoFixed crop intent.
Ruben Brunk [Thu, 25 Oct 2012 22:53:42 +0000 (15:53 -0700)]
Fixed crop intent.

Bug: 7415140
Bug: 7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091

11 years agoam 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos...
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.

11 years agoMerge "Tagged strings in XML with translation info." into gb-ub-photos-arches
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

11 years agoCherry-pick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
Scott Main [Thu, 18 Oct 2012 18:59:47 +0000 (11:59 -0700)]
Cherry-pick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8

remove old fashioned Dream, no longer supported

Conflicts:

AndroidManifest.xml

Change-Id: I4e680d771596c07652610b95e055c1317e048fb8

11 years agoam 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos...
Bobby Georgescu [Thu, 25 Oct 2012 20:16:22 +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

11 years agoMerge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
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

11 years agoam 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches
Michael Jurka [Thu, 25 Oct 2012 19:30:05 +0000 (12:30 -0700)]
am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit '0c7e8aac441c18117b8daf3255d2658b83a37bde':
  Fix build.

11 years agoMerge "Fix build." into gb-ub-photos-arches
Michael Jurka [Thu, 25 Oct 2012 19:28:28 +0000 (12:28 -0700)]
Merge "Fix build." into gb-ub-photos-arches

11 years agoFix build.
Angus Kong [Thu, 25 Oct 2012 19:21:23 +0000 (03:21 +0800)]
Fix build.

Change-Id: Ia7b581eba32f98d695117526d25876e7a8a398c0

11 years agoam 8bc296e2: Fix crash when starting filtereditor
nicolasroard [Thu, 25 Oct 2012 19:19:50 +0000 (12:19 -0700)]
am 8bc296e2: Fix crash when starting filtereditor

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

11 years agoTagged strings in XML with translation info.
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

11 years agoFix crash when starting filtereditor
nicolasroard [Thu, 25 Oct 2012 18:54:57 +0000 (11:54 -0700)]
Fix crash when starting filtereditor

bug:7415170
Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8

11 years agoGet rid of black lines near edge of thumbnails
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

11 years agoam 71c17775: 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.

11 years agoForce 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

11 years agoam dffe6a6f: Fix default for tiny planet
nicolasroard [Thu, 25 Oct 2012 05:44:06 +0000 (22:44 -0700)]
am dffe6a6f: Fix default for tiny planet

* commit 'dffe6a6f8bbf4565df211b07bcfc23d6864a48b6':
  Fix default for tiny planet

11 years agoam e7a71372: Fix update view
nicolasroard [Thu, 25 Oct 2012 05:03:51 +0000 (22:03 -0700)]
am e7a71372: Fix update view

* commit 'e7a71372747af0ef03f9d953c28ed62de58315d3':
  Fix update view

11 years agoFix default for tiny planet
nicolasroard [Thu, 25 Oct 2012 05:02:40 +0000 (22:02 -0700)]
Fix default for tiny planet

bug:7410938
Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd

11 years agoFix update view
nicolasroard [Thu, 25 Oct 2012 04:50:24 +0000 (21:50 -0700)]
Fix update view

bug:7410583
Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646

11 years agoFix tiling effect when open a photo.
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

11 years agoam ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches
nicolasroard [Thu, 25 Oct 2012 04:13:26 +0000 (21:13 -0700)]
am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7':
  Remove the old photo editor

11 years agoMerge "Remove the old photo editor" into gb-ub-photos-arches
nicolasroard [Thu, 25 Oct 2012 04:11:06 +0000 (21:11 -0700)]
Merge "Remove the old photo editor" into gb-ub-photos-arches

11 years agoMerge "Handle invalid offset size in ExifParser" into gb-ub-photos-bryce
Hung-ying Tyan [Thu, 25 Oct 2012 03:26:10 +0000 (20:26 -0700)]
Merge "Handle invalid offset size in ExifParser" into gb-ub-photos-bryce

11 years agoam b13e1788: Merge "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.

11 years agoMerge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos...
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

11 years agoam 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub...
Ruben Brunk [Thu, 25 Oct 2012 02:39:18 +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.

11 years agoMerge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
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

11 years agoFixed blackscreen when launching crop from menu.
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

11 years agoFixes TinyPlanet crashed due to too excessive memory usage.
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

11 years agoam 2c6ea941: Add rotation to tinyplanet view
nicolasroard [Thu, 25 Oct 2012 01:39:48 +0000 (18:39 -0700)]
am 2c6ea941: Add rotation to tinyplanet view

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

11 years agoRemove the old photo editor
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)

11 years agoAdd rotation to tinyplanet view
nicolasroard [Thu, 25 Oct 2012 00:47:12 +0000 (17:47 -0700)]
Add rotation to tinyplanet view

bug:7389189
Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d

11 years agoam 7592704e: Fixes UI stuff
nicolasroard [Thu, 25 Oct 2012 00:28:56 +0000 (17:28 -0700)]
am 7592704e: Fixes UI stuff

* commit '7592704e662e49e4bbf3ba86a43d790774829bb0':
  Fixes UI stuff

11 years agoFixes UI stuff
nicolasroard [Wed, 24 Oct 2012 23:39:41 +0000 (16:39 -0700)]
Fixes UI stuff

bug:7393871
bug:7387596
Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f

11 years agoam ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches
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.

11 years agoMerge "Initialize the modified date correctly." into gb-ub-photos-arches
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

11 years agoam 0a23b42e: 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

11 years agoChange 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

11 years agoInitialize the modified date correctly.
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

11 years agoam 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos...
Bobby Georgescu [Wed, 24 Oct 2012 21:27:04 +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

11 years agoMerge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
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

11 years agoam d49d5320: 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

11 years agoFix attempted uploading of recycled tiles
Bobby Georgescu [Wed, 24 Oct 2012 21:15:38 +0000 (14:15 -0700)]
Fix attempted uploading of recycled tiles

Bug: 7405398
Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548

11 years agoMove loadBitmap to async task
John Reck [Wed, 24 Oct 2012 19:56:31 +0000 (12:56 -0700)]
Move loadBitmap to async task

 Bug: 7406705

Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a

11 years agoam 5bd00332: Launch built-in camera app via filmstrip
Bobby Georgescu [Wed, 24 Oct 2012 20:53:28 +0000 (13:53 -0700)]
am 5bd00332: Launch built-in camera app via filmstrip

* commit '5bd00332556b20c141b5c7f16433d55b1bc7fe0f':
  Launch built-in camera app via filmstrip

11 years agoLaunch 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

11 years agoam eb6a24e1: Took out aspect ratio switching.
Ruben Brunk [Wed, 24 Oct 2012 18:50:41 +0000 (11:50 -0700)]
am eb6a24e1: Took out aspect ratio switching.

* commit 'eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9':
  Took out aspect ratio switching.

11 years agoTook 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

11 years agoam ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
nicolasroard [Wed, 24 Oct 2012 18:39:21 +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

11 years agoMerge "Save the image when applying tiny planet" into gb-ub-photos-arches
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

11 years agoSave the image when applying tiny planet
nicolasroard [Wed, 24 Oct 2012 18:31:57 +0000 (11:31 -0700)]
Save the image when applying tiny planet

bug:7403622
Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16

11 years agoam de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
John Hoford [Wed, 24 Oct 2012 18:17:10 +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

11 years agoMerge "limited the size of textures to 2048" into gb-ub-photos-arches
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

11 years agolimited the size of textures to 2048
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

11 years agoam a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb...
Bobby Georgescu [Wed, 24 Oct 2012 16:56:49 +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

11 years agoMerge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
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

11 years agoam a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 24 Oct 2012 16:44:29 +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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 24 Oct 2012 16:42:50 +0000 (09:42 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Wed, 24 Oct 2012 16:42:04 +0000 (09:42 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoDo not show bottom controls when undo bar is visible
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

11 years agoam f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb...
Bobby Georgescu [Wed, 24 Oct 2012 16:18:03 +0000 (09:18 -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

11 years agoMerge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 15:18:03 +0000 (08:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0160ad253cb63f8e5076d69bb13a90f1137d4d49
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
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

11 years agoam adee31f0: Use TiledTexture for thumbnails.
Owen Lin [Wed, 24 Oct 2012 08:32:51 +0000 (01:32 -0700)]
am adee31f0: Use TiledTexture for thumbnails.

* commit 'adee31f028d839e7baa8f9e052dc4e4d60b137da':
  Use TiledTexture for thumbnails.

11 years agoMerge "Use List to store duplicated exif tag" into gb-ub-photos-bryce
Hung-ying Tyan [Wed, 24 Oct 2012 07:43:13 +0000 (00:43 -0700)]
Merge "Use List to store duplicated exif tag" into gb-ub-photos-bryce

11 years agoMerge "Use NO_VALUE in ground truth of exif test when no valid value from exiftool...
Hung-ying Tyan [Wed, 24 Oct 2012 07:30:30 +0000 (00:30 -0700)]
Merge "Use NO_VALUE in ground truth of exif test when no valid value from exiftool" into gb-ub-photos-bryce

11 years agoMerge "Change the print format TYPE_BYTE of exifTag" into gb-ub-photos-bryce
Hung-ying Tyan [Wed, 24 Oct 2012 07:26:38 +0000 (00:26 -0700)]
Merge "Change the print format TYPE_BYTE of exifTag" into gb-ub-photos-bryce

11 years agoMerge "Use 'US-ASCII' as the default charset for ExifParser" into gb-ub-photos-bryce
Hung-ying Tyan [Wed, 24 Oct 2012 07:24:55 +0000 (00:24 -0700)]
Merge "Use 'US-ASCII' as the default charset for ExifParser" into gb-ub-photos-bryce

11 years agoUse 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

11 years agoam c60752b2: Use XMP meta-data for correct tiny planets.
Sascha Haeberling [Wed, 24 Oct 2012 05:47:15 +0000 (22:47 -0700)]
am c60752b2: Use XMP meta-data for correct tiny planets.

* commit 'c60752b28bcdc859b24040f77883568e0838ed74':
  Use XMP meta-data for correct tiny planets.

11 years agoUse 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

11 years agoam eb75699b: Fixed scaling factor for ImageShow and rotations.
Ruben Brunk [Wed, 24 Oct 2012 05:12:45 +0000 (22:12 -0700)]
am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit 'eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389':
  Fixed scaling factor for ImageShow and rotations.

11 years agoFixed 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

11 years agoDo not show Camera placeholder when not appropriate
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

11 years agoHandle invalid offset size in ExifParser
Earl Ou [Thu, 18 Oct 2012 11:13:37 +0000 (19:13 +0800)]
Handle invalid offset size in ExifParser

Change-Id: I9036f8ea9d7a956a74f4d0cd15ef210dbd9f1de3