OSDN Git Service

android-x86/packages-apps-Camera2.git
11 years agoam f1a99b9f: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbn...
Bobby Georgescu [Mon, 5 Nov 2012 23:50:08 +0000 (15:50 -0800)]
am f1a99b9f: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

* commit 'f1a99b9f0dc504b6517c17a5a203a7d3c3c75834':

11 years agoam f1d6566a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos...
John Reck [Mon, 5 Nov 2012 23:50:07 +0000 (15:50 -0800)]
am f1d6566a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit 'f1d6566a2df59e6c1402f95dab3cb51069aa880b':

11 years agoam ef9cf18c: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operatio...
Bobby Georgescu [Mon, 5 Nov 2012 23:50:05 +0000 (15:50 -0800)]
am ef9cf18c: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

* commit 'ef9cf18c436df3c18989f53c0e2bb14b87ecb487':

11 years agoam 149b5167: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror
nicolasroard [Mon, 5 Nov 2012 23:50:04 +0000 (15:50 -0800)]
am 149b5167: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror

* commit '149b5167a71cf221c821579746dfac199ab89ee2':

11 years agoam c11b4c85: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into...
nicolasroard [Mon, 5 Nov 2012 23:50:03 +0000 (15:50 -0800)]
am c11b4c85: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit 'c11b4c85f80b24a0e9af089cfd96bd2af1bdf108':

11 years agoam aad5aa69: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo...
Hung-ying Tyan [Mon, 5 Nov 2012 23:50:02 +0000 (15:50 -0800)]
am aad5aa69: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit 'aad5aa69f8393ba1ca3a010afbe554ac84efbf79':

11 years agoam 69664062: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inita...
Nicolas Roard [Mon, 5 Nov 2012 23:50:00 +0000 (15:50 -0800)]
am 69664062: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit '69664062bc9039a0d548a7666680a852db947c33':

11 years agoam 62b46051: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos...
John Reck [Mon, 5 Nov 2012 23:49:59 +0000 (15:49 -0800)]
am 62b46051: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit '62b46051d75cc323332eeb4c0c79e3895647cb5a':

11 years agoam 485797d7: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type...
Mangesh Ghiware [Mon, 5 Nov 2012 23:49:58 +0000 (15:49 -0800)]
am 485797d7: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit '485797d7aec85f3ddf990522ee8c55a04a2c95ab':

11 years agoam 348b64a0: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\...
Ruben Brunk [Mon, 5 Nov 2012 23:49:57 +0000 (15:49 -0800)]
am 348b64a0: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit '348b64a0414a1c8143e1997fe44efd4ac91a8665':

11 years agoam eee46d78: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos...
Ruben Brunk [Mon, 5 Nov 2012 23:49:56 +0000 (15:49 -0800)]
am eee46d78: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit 'eee46d78ba7231db50e096b1b4acff2f3937b3c4':

11 years agoam dc87b334: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation...
Ruben Brunk [Mon, 5 Nov 2012 23:49:54 +0000 (15:49 -0800)]
am dc87b334: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

* commit 'dc87b334fe834fab09c8a220500b9c1683561543':

11 years agoam b83e3632: am f38cb998: Fix conflict with other build fix
Michael Jurka [Mon, 5 Nov 2012 23:49:53 +0000 (15:49 -0800)]
am b83e3632: am f38cb998: Fix conflict with other build fix

* commit 'b83e3632acf59c2e790f6d22f7830891db44852b':

11 years agoam 8ee82082: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of...
Bobby Georgescu [Mon, 5 Nov 2012 23:49:52 +0000 (15:49 -0800)]
am 8ee82082: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '8ee820827f9087dec7e82cdf75976330a62bbd06':

11 years agoam 559d76f9: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches
Michael Jurka [Mon, 5 Nov 2012 23:49:51 +0000 (15:49 -0800)]
am 559d76f9: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit '559d76f993af7a72a077427af87eb1dc655b6540':

11 years agoam 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev
Michael Jurka [Mon, 5 Nov 2012 23:49:50 +0000 (15:49 -0800)]
am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev

* commit '1c4fafe902ef9b527abab4be992dcf253efc1701':

11 years agoam 9f4d5f1b: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor
nicolasroard [Mon, 5 Nov 2012 23:49:48 +0000 (15:49 -0800)]
am 9f4d5f1b: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor

* commit '9f4d5f1ba9f395092709f042cf6967c05c679c25':

11 years agoam 9b12b990: am c6b77275: am 71c17775: Force renderring request for Camera Animation.
Angus Kong [Mon, 5 Nov 2012 23:49:47 +0000 (15:49 -0800)]
am 9b12b990: am c6b77275: am 71c17775: Force renderring request for Camera Animation.

* commit '9b12b990cd9262dfc15c274e66681531352315e2':

11 years agoam 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet
nicolasroard [Mon, 5 Nov 2012 23:49:46 +0000 (15:49 -0800)]
am 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet

* commit '9ed116642f07ae6a52be132077fcdfb2790a4758':

11 years agoam e3642a33: am 73a2ad06: am e7a71372: Fix update view
nicolasroard [Mon, 5 Nov 2012 23:49:45 +0000 (15:49 -0800)]
am e3642a33: am 73a2ad06: am e7a71372: Fix update view

* commit 'e3642a3362e1e6fbdcc0b4ffb0963657f4e1caf0':

11 years agoam d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb...
nicolasroard [Mon, 5 Nov 2012 23:49:43 +0000 (15:49 -0800)]
am d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'd491af093d8614e33b89bccaa1db030128eaaa25':

11 years agoam fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too...
Sascha Haeberling [Mon, 5 Nov 2012 23:49:42 +0000 (15:49 -0800)]
am fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

* commit 'fb49447912a3acf5bbadcfcb696a282b6765b05f':

11 years agoam a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop...
Ruben Brunk [Mon, 5 Nov 2012 23:49:41 +0000 (15:49 -0800)]
am a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

* commit 'a9bc6deb8e4eb9e57b13d83a33251e62d6a87e01':

11 years agoam c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view
nicolasroard [Mon, 5 Nov 2012 23:49:39 +0000 (15:49 -0800)]
am c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view

* commit 'c6b4ecf682ce95e5b5a725fa8c8fdf61bad79c83':

11 years agoam e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff
nicolasroard [Mon, 5 Nov 2012 23:49:38 +0000 (15:49 -0800)]
am e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff

* commit 'e8df5a6da384b8c6b7dc86ea4c880d691359422b':

11 years agoam 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly...
Teng-Hui Zhu [Mon, 5 Nov 2012 23:49:37 +0000 (15:49 -0800)]
am 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches

* commit '0a82481b7375efcbf07e677e2682be166d58a001':

11 years agoam a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors
nicolasroard [Mon, 5 Nov 2012 23:49:36 +0000 (15:49 -0800)]
am a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors

* commit 'a19301bba9c02be5c2b3d8d1460286d84022f610':

11 years agoam f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled...
Bobby Georgescu [Mon, 5 Nov 2012 23:49:34 +0000 (15:49 -0800)]
am f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

* commit 'f254567f344826e3398a645cd0c87012653d184f':

11 years agoam d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task
John Reck [Mon, 5 Nov 2012 23:49:33 +0000 (15:49 -0800)]
am d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task

* commit 'd2173fc83d62caac54ec659a961a859dc18321b6':

11 years agoam a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip
Bobby Georgescu [Mon, 5 Nov 2012 23:49:32 +0000 (15:49 -0800)]
am a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip

* commit 'a8227bbee10f8aabff550c4baca09247985ca775':

11 years agoam 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching.
Ruben Brunk [Mon, 5 Nov 2012 23:49:30 +0000 (15:49 -0800)]
am 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching.

* commit '0b549f611c7d220355fb455dbff2c2d7f876cead':

11 years agoam fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny plane...
nicolasroard [Mon, 5 Nov 2012 23:49:29 +0000 (15:49 -0800)]
am fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches

* commit 'fbe416ada2674df7c5488b693d88602da0d761c2':

11 years agoam 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048...
John Hoford [Mon, 5 Nov 2012 23:49:27 +0000 (15:49 -0800)]
am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit '9da23648df344bd4bcc3d4ce8243936e5353aaf3':

11 years agoam 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo...
Bobby Georgescu [Mon, 5 Nov 2012 23:49:26 +0000 (15:49 -0800)]
am 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

* commit '624ad6d08fc12169a1cbdd2013496de93fdb72c7':

11 years agoam 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 5 Nov 2012 23:49:25 +0000 (15:49 -0800)]
am 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5b41962e717d65f6b4db37300ca274fd62c6df91':

11 years agoam 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations...
Baligh Uddin [Mon, 5 Nov 2012 23:49:23 +0000 (15:49 -0800)]
am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '5c9c8ac303db6f29abae6b3180a1d377d71e66fa':

11 years agoam 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when...
Bobby Georgescu [Mon, 5 Nov 2012 23:49:22 +0000 (15:49 -0800)]
am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches

* commit '03470f4ce6b931cdf0a388f6b5174f3f53afa9a0':

11 years agoam 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails.
Owen Lin [Mon, 5 Nov 2012 23:49:21 +0000 (15:49 -0800)]
am 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails.

* commit '2fc6e3a55c29fe214b7c975b9ba798e14dca62b4':

11 years agoam a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.
Sascha Haeberling [Mon, 5 Nov 2012 23:49:20 +0000 (15:49 -0800)]
am a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.

* commit 'a03998c9adb9a0b53696d64c666fc7e39fa7292d':

11 years agoam b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.
Ruben Brunk [Mon, 5 Nov 2012 23:49:18 +0000 (15:49 -0800)]
am b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit 'b004a6f93a883887b73e98fd5191689f9890290e':

11 years agoam f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb...
Ruben Brunk [Mon, 5 Nov 2012 23:49:17 +0000 (15:49 -0800)]
am f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches

* commit 'f60139cee9f3db343e378547b27dfb68377a486d':

11 years agoam c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on...
Nicolas Roard [Mon, 5 Nov 2012 23:49:16 +0000 (15:49 -0800)]
am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit 'c0c5c138068a8d5b0b5db2c7583f0bcf5074be71':

11 years agoam c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a...
Doris Liu [Mon, 5 Nov 2012 23:49:14 +0000 (15:49 -0800)]
am c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit 'c3d2b085294e28adf3f41e2e26b3261415ce8f85':

11 years agoam d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping.
Ruben Brunk [Mon, 5 Nov 2012 23:49:13 +0000 (15:49 -0800)]
am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping.

* commit 'd8ddd8d841da84973f451e2aca7a4f871b2861ca':

11 years agoam e1036a50: Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 23:49:12 +0000 (15:49 -0800)]
am e1036a50: Import translations. DO NOT MERGE

* commit 'e1036a509ec62c1d9146ca72e3a39313d0310a2d':
  Import translations. DO NOT MERGE

11 years agoam 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI.
Ruben Brunk [Mon, 5 Nov 2012 23:49:10 +0000 (15:49 -0800)]
am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI.

* commit '2fe28fc3042ee411d46e581a24a64e073d6d4e2a':

11 years agoam ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add...
John Hoford [Mon, 5 Nov 2012 23:49:09 +0000 (15:49 -0800)]
am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit 'ea4097c9ac4f3b56c065eaaf8b72bc0ee3743b0f':

11 years agoam beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera...
Bobby Georgescu [Mon, 5 Nov 2012 23:49:08 +0000 (15:49 -0800)]
am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip

* commit 'beda88a7038e82565011c26804940f25f3fd789a':

11 years agoam 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout
nicolasroard [Mon, 5 Nov 2012 23:49:06 +0000 (15:49 -0800)]
am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout

* commit '7c30dc018590fc3b44fb1f208e121470ef0aac9d':

11 years agoam 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages...
nicolasroard [Mon, 5 Nov 2012 23:49:05 +0000 (15:49 -0800)]
am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit '808a5869a56f8a3671f7c80c319dff6b94ea7915':

11 years agoam 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
John Reck [Mon, 5 Nov 2012 23:49:03 +0000 (15:49 -0800)]
am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit '590acf8681c11395e9b9548e4cd8a205902cbb35':

11 years agoam 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into...
George Mount [Mon, 5 Nov 2012 23:48:59 +0000 (15:48 -0800)]
am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '0827ebf079934ae9e6cb7285e785a1a179f155fa':

11 years agoam 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation...
nicolasroard [Mon, 5 Nov 2012 23:48:56 +0000 (15:48 -0800)]
am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit '30fd4b427eb84d553dfcae3759707f9d8da75001':

11 years agoam 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from exter...
Sascha Haeberling [Mon, 5 Nov 2012 23:48:55 +0000 (15:48 -0800)]
am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit '22fae1820b13017c121879774b0afd522ecee676':

11 years agoam 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves
nicolasroard [Mon, 5 Nov 2012 23:48:54 +0000 (15:48 -0800)]
am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves

* commit '05757033049bd84e44f695ca781889d44577c589':

11 years agoam 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into...
nicolasroard [Mon, 5 Nov 2012 23:48:52 +0000 (15:48 -0800)]
am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit '4626ebd1e289777868f33abb5e0b3a4bc116961e':

11 years agoam 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstri...
Bobby Georgescu [Mon, 5 Nov 2012 23:48:51 +0000 (15:48 -0800)]
am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit '75a448eb193308f6b9268968265895c019ae3ab2':

11 years agoam b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices
nicolasroard [Mon, 5 Nov 2012 23:48:50 +0000 (15:48 -0800)]
am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices

* commit 'b8f4ea38c6096cb806b60986c0d11ef9761db665':

11 years agoam c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Mon, 5 Nov 2012 23:48:48 +0000 (15:48 -0800)]
am c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'c54c78392cc9007be5a9f0cd2bf7d003a883a6ff':

11 years agoam cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modul...
nicolasroard [Mon, 5 Nov 2012 23:48:47 +0000 (15:48 -0800)]
am cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit 'cd35c2fc673f455de2d5853ecf1248d8ff167742':

11 years agoam b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for...
George Mount [Mon, 5 Nov 2012 23:48:46 +0000 (15:48 -0800)]
am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit 'b2fb154fa84ec663bb8e181c299a3868e9ee98aa':

11 years agoam 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO...
Baligh Uddin [Mon, 5 Nov 2012 23:48:44 +0000 (15:48 -0800)]
am 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '0f40db8d736ab95f0a3c9b03c9b20f5bd85a34f1':

11 years agoam e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 23:48:43 +0000 (15:48 -0800)]
am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE

* commit 'e6319953a3b2d11251b57bfb6cd2a5e0ffbb552d':

11 years agoam 69cec707: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 23:48:41 +0000 (15:48 -0800)]
am 69cec707: (-s ours) Import translations. DO NOT MERGE

* commit '69cec707836ae8c072da9e0015160b96a5c5c6be':
  Import translations. DO NOT MERGE

11 years agoam 57900769: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
John Hoford [Mon, 5 Nov 2012 23:45:00 +0000 (15:45 -0800)]
am 57900769: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit '5790076999dfcd7d8cadb7ce616968a4954a5cc4':

11 years agoam f7c1c580: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera...
Mangesh Ghiware [Mon, 5 Nov 2012 23:44:58 +0000 (15:44 -0800)]
am f7c1c580: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches

* commit 'f7c1c580996c0fd874811871b9ca202cb191b674':

11 years agoam 6377a7e8: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub...
Bobby Georgescu [Mon, 5 Nov 2012 23:44:56 +0000 (15:44 -0800)]
am 6377a7e8: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit '6377a7e8d36a60e0fe5be9854f0112ab5b654e01':

11 years agoam 574be81d: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid...
Doris Liu [Mon, 5 Nov 2012 23:44:55 +0000 (15:44 -0800)]
am 574be81d: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '574be81d8b20df74f827bb4a1fba9b969a251102':

11 years agoam c09daea1: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon...
Hung-ying Tyan [Mon, 5 Nov 2012 23:44:53 +0000 (15:44 -0800)]
am c09daea1: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit 'c09daea126a7f1d609908883958963a99d86e896':

11 years agoam 38d29567: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer...
John Reck [Mon, 5 Nov 2012 23:44:51 +0000 (15:44 -0800)]
am 38d29567: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit '38d295679f6f81313d1e2ec8d4f765255467f267':

11 years agoam 20a91815: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmst...
Bobby Georgescu [Mon, 5 Nov 2012 23:44:50 +0000 (15:44 -0800)]
am 20a91815: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit '20a91815828f7f0a98eb4b577eb9c618b870b1d0':

11 years agoam 6d9a6ff8: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into...
Ruben Brunk [Mon, 5 Nov 2012 23:44:48 +0000 (15:44 -0800)]
am 6d9a6ff8: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '6d9a6ff8ed24be732f98cb83180f951e871f98dd':

11 years agoam b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscre...
Baligh Uddin [Mon, 5 Nov 2012 23:44:46 +0000 (15:44 -0800)]
am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'b2993d29a712533610d7c4b39b31ad74f0d76c68':
  Import translations. DO NOT MERGE

11 years agoam 1b73272f: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res...
Bobby Georgescu [Mon, 5 Nov 2012 23:43:11 +0000 (15:43 -0800)]
am 1b73272f: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit '1b73272f029c89541ad5e230865b50bf4532876a':

11 years agoam d5d4246f: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProv...
George Mount [Mon, 5 Nov 2012 23:43:10 +0000 (15:43 -0800)]
am d5d4246f: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit 'd5d4246ffcbdfdf491846b1a314fb59064e2f4b4':

11 years agoam 541b5568: am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations...
Baligh Uddin [Mon, 5 Nov 2012 23:43:08 +0000 (15:43 -0800)]
am 541b5568: am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '541b5568552c09077b562a284c3b7d24549b2ea2':

11 years agoam e2dd5119: (-s ours) am 2ed15703: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 5 Nov 2012 23:43:07 +0000 (15:43 -0800)]
am e2dd5119: (-s ours) am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'e2dd511925056b11ab12b782e9e80a6a4038f042':

11 years agoam e7e4f11e: am 34347598: am 1dace572: Merge "Better transition between Gallery and...
Bobby Georgescu [Mon, 5 Nov 2012 23:40:37 +0000 (15:40 -0800)]
am e7e4f11e: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit 'e7e4f11e28420cc6eb673505e63d57a6467efed3':

11 years agoam 82a7226c: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings...
Ruben Brunk [Mon, 5 Nov 2012 23:40:36 +0000 (15:40 -0800)]
am 82a7226c: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '82a7226cd5345c9397302e4951c238d95a5bc35a':

11 years agoam 2d61ca92: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state...
nicolasroard [Mon, 5 Nov 2012 23:40:34 +0000 (15:40 -0800)]
am 2d61ca92: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

* commit '2d61ca92facb2120b04f589f6a40e7f15e1b6b06':

11 years agoam 8374ab71: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb...
Bobby Georgescu [Mon, 5 Nov 2012 23:40:33 +0000 (15:40 -0800)]
am 8374ab71: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches

* commit '8374ab719341ce2a1939ebac5322360f008cedbb':

11 years agoam 7741a8e0: am e4614408: am c778aab1: Prevent unveil direction to change as long...
nicolasroard [Mon, 5 Nov 2012 23:40:31 +0000 (15:40 -0800)]
am 7741a8e0: am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up

* commit '7741a8e07869d9eb9677fa683f0f913ccd84ecf9':

11 years agoam 286af73c: am e54e5002: am 15a056e3: Fix crash in Curves module
nicolasroard [Mon, 5 Nov 2012 23:40:30 +0000 (15:40 -0800)]
am 286af73c: am e54e5002: am 15a056e3: Fix crash in Curves module

* commit '286af73cc652d7f9381c33aa303b2581f17ed053':

11 years agoam 4e612a39: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten
nicolasroard [Mon, 5 Nov 2012 23:40:28 +0000 (15:40 -0800)]
am 4e612a39: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten

* commit '4e612a39112808a7978e4c0b21a66fba9091d772':

11 years agoam 1684248c: am afc8c49f: am 4d276f33: Only translate the main panel if we have to.
nicolasroard [Mon, 5 Nov 2012 23:40:27 +0000 (15:40 -0800)]
am 1684248c: am afc8c49f: am 4d276f33: Only translate the main panel if we have to.

* commit '1684248c622f35ba486be58ba8c49919c194b6b4':

11 years agoam 25c35df0: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android...
nicolasroard [Mon, 5 Nov 2012 23:40:22 +0000 (15:40 -0800)]
am 25c35df0: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/

* commit '25c35df06354db9e6a5ff7cacbfa1d967eecb9c1':

11 years agoam eae7682e: am 5d4ba127: am 2daced6b: Fix for active action bar in camera
Doris Liu [Mon, 5 Nov 2012 23:40:20 +0000 (15:40 -0800)]
am eae7682e: am 5d4ba127: am 2daced6b: Fix for active action bar in camera

* commit 'eae7682e16208fc510cd3a1cd828d597bc93c531':

11 years agoam 3f8990b6: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection...
Sascha Haeberling [Mon, 5 Nov 2012 23:40:19 +0000 (15:40 -0800)]
am 3f8990b6: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter.

* commit '3f8990b60d4fb858aecdc0039df26ea11bb5152b':

11 years agoam 172b1b6f: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet
John Hoford [Mon, 5 Nov 2012 23:40:17 +0000 (15:40 -0800)]
am 172b1b6f: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet

* commit '172b1b6f58ef3a727ef2c4ed34cb2e7c0005fe30':

11 years agoam c908d79e: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip
Bobby Georgescu [Mon, 5 Nov 2012 23:40:16 +0000 (15:40 -0800)]
am c908d79e: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip

* commit 'c908d79e8a6b4826ba71830fe8f545c57f8942bb':

11 years agoam 4ff1732d: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub...
nicolasroard [Mon, 5 Nov 2012 23:40:14 +0000 (15:40 -0800)]
am 4ff1732d: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches

* commit '4ff1732d2d0766a139e4a105cfaad6874982ad8a':

11 years agoam 1b5a21d2: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid...
George Mount [Mon, 5 Nov 2012 23:40:13 +0000 (15:40 -0800)]
am 1b5a21d2: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode.

* commit '1b5a21d2286d50f1da3a3df0f40c1144c5778882':

11 years agoam 23d7dd46: am ddb30c54: am 4883dafd: Merge "Change number of album rows on large...
Bobby Georgescu [Mon, 5 Nov 2012 23:40:11 +0000 (15:40 -0800)]
am 23d7dd46: am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches

* commit '23d7dd46aff419f0994840c6a085cc089969b5d7':

11 years agoam 21cb756b: am 921b0a70: am ea78390e: Re-enable crop for new panorama
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:10 +0000 (15:40 -0800)]
am 21cb756b: am 921b0a70: am ea78390e: Re-enable crop for new panorama

* commit '21cb756bfa59247b6c897e3b067bed5aed13e033':

11 years agoam c6381a2a: am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into...
Ruben Brunk [Mon, 5 Nov 2012 23:40:08 +0000 (15:40 -0800)]
am c6381a2a: am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit 'c6381a2a6ccf0bb7fba7fa44a1e7786c20f709dd':

11 years agoam 239bc478: am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstr...
Bobby Georgescu [Mon, 5 Nov 2012 23:40:07 +0000 (15:40 -0800)]
am 239bc478: am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches

* commit '239bc478a7dfa9343eb8b2547fb54172f50e72aa':

11 years agoam 5e1709a2: am f795b403: am b037754e: Fix sharing state in Gallery ActionBar
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:05 +0000 (15:40 -0800)]
am 5e1709a2: am f795b403: am b037754e: Fix sharing state in Gallery ActionBar

* commit '5e1709a237e08cf12e0335796ed17ecb24d5a632':

11 years agoam 2f7e2992: am 0f327c32: am c5590eb1: Improves Curves & Crop UI
nicolasroard [Mon, 5 Nov 2012 23:40:04 +0000 (15:40 -0800)]
am 2f7e2992: am 0f327c32: am c5590eb1: Improves Curves & Crop UI

* commit '2f7e2992af1ba12484ee21f4c8d95bfe20496806':

11 years agoam a175392c: am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in galle...
Doris Liu [Mon, 5 Nov 2012 23:40:02 +0000 (15:40 -0800)]
am a175392c: am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches

* commit 'a175392c7073819ee6711099d6ce6aa40167b8dd':

11 years agoam 52e44d24: am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos...
Bobby Georgescu [Mon, 5 Nov 2012 23:40:01 +0000 (15:40 -0800)]
am 52e44d24: am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches

* commit '52e44d249893969910b241aded0f9796d5dfa03d':