OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 301531ef: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstri...
Bobby Georgescu [Tue, 23 Oct 2012 18:55:51 +0000 (11:55 -0700)]
am 301531ef: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit '301531ef59957971bb99ae4be0c60a896e850770':
  Show Panorama viewer button in filmstrip mode

11 years agoam f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into...
Bobby Georgescu [Tue, 23 Oct 2012 18:54:17 +0000 (11:54 -0700)]
am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit 'f30096b4f1f3de6fd4c95e706c10cdfd72a5db3b':
  Show Panorama viewer button in filmstrip mode

11 years agoam c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos...
Bobby Georgescu [Tue, 23 Oct 2012 18:52:53 +0000 (11:52 -0700)]
am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0':
  Show Panorama viewer button in filmstrip mode

11 years agoMerge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 18:51:06 +0000 (11:51 -0700)]
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

11 years agoam 5ba40c19: am e5a3ff76: am a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:47:05 +0000 (11:47 -0700)]
am 5ba40c19: am e5a3ff76: am a9f280f9: Add copyright notices

* commit '5ba40c19929438e1eb64c16a8ef07247e79fc43b':
  Add copyright notices

11 years agoam e5a3ff76: am a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:44:42 +0000 (11:44 -0700)]
am e5a3ff76: am a9f280f9: Add copyright notices

* commit 'e5a3ff7692de92739645d97d72b5bdc599fd6fbf':
  Add copyright notices

11 years agoam a9f280f9: Add copyright notices
nicolasroard [Tue, 23 Oct 2012 18:42:32 +0000 (11:42 -0700)]
am a9f280f9: Add copyright notices

* commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1':
  Add copyright notices

11 years agoShow Panorama viewer button in filmstrip mode
Bobby Georgescu [Tue, 23 Oct 2012 18:20:48 +0000 (11:20 -0700)]
Show Panorama viewer button in filmstrip mode

Bug: 7393346
Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c

11 years agoAdd copyright notices
nicolasroard [Tue, 23 Oct 2012 18:26:38 +0000 (11:26 -0700)]
Add copyright notices

bug:7387634
Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1

11 years agoam 20da13c5: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:19:22 +0000 (11:19 -0700)]
am 20da13c5: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit '20da13c584b0997562fd75ae352f769acf8aa278':
  Fix slow / jerky tracking in Curves

11 years agoam cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:16:44 +0000 (11:16 -0700)]
am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'cdaa77d200c27a7fa2ba5be03bfcd24487cdcb58':
  Fix slow / jerky tracking in Curves

11 years agoam ec995b6b: Fix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 18:14:20 +0000 (11:14 -0700)]
am ec995b6b: Fix slow / jerky tracking in Curves

* commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc':
  Fix slow / jerky tracking in Curves

11 years agoFix slow / jerky tracking in Curves
nicolasroard [Tue, 23 Oct 2012 17:51:42 +0000 (10:51 -0700)]
Fix slow / jerky tracking in Curves

bug:7394837
Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91

11 years agoam 1ecc749b: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modul...
nicolasroard [Tue, 23 Oct 2012 17:42:16 +0000 (10:42 -0700)]
am 1ecc749b: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '1ecc749b57a5dbde443ae9baf008653829f7c3e7':
  Shows filtered images in geometry modules and comparison.

11 years agoam 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and compar...
nicolasroard [Tue, 23 Oct 2012 17:39:43 +0000 (10:39 -0700)]
am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '488547b08f909a2f35433764fc97a5f8c7c990df':
  Shows filtered images in geometry modules and comparison.

11 years agoam 2569df23: Merge "Shows filtered images in geometry modules and comparison." into...
nicolasroard [Tue, 23 Oct 2012 17:36:47 +0000 (10:36 -0700)]
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

* commit '2569df233987d1f43400a813ceb2ce72c738a4c3':
  Shows filtered images in geometry modules and comparison.

11 years agoMerge "Shows filtered images in geometry modules and comparison." into gb-ub-photos...
nicolasroard [Tue, 23 Oct 2012 17:34:10 +0000 (10:34 -0700)]
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches

11 years agoam 76b4bea4: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for...
George Mount [Tue, 23 Oct 2012 17:33:13 +0000 (10:33 -0700)]
am 76b4bea4: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '76b4bea4e2cb77546df37bc8b674c0154c64af82':
  Ensure photo sphere icon shows for panoramas.

11 years agoam 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into...
George Mount [Tue, 23 Oct 2012 17:31:00 +0000 (10:31 -0700)]
am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '3bfbae1d63fc755b8fef3b200912b03a1f3ec3a9':
  Ensure photo sphere icon shows for panoramas.

11 years agoam 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos...
George Mount [Tue, 23 Oct 2012 17:28:35 +0000 (10:28 -0700)]
am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit '24af89b96e824e4a5f9053c2024f507087117c22':
  Ensure photo sphere icon shows for panoramas.

11 years agoMerge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
George Mount [Tue, 23 Oct 2012 17:26:49 +0000 (10:26 -0700)]
Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

11 years agoShows filtered images in geometry modules and comparison.
nicolasroard [Sat, 20 Oct 2012 19:32:05 +0000 (12:32 -0700)]
Shows filtered images in geometry modules and comparison.

bug:7279469
bug:7379286
bug:7344214
bug:7379140

Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves

Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8

11 years agoEnsure photo sphere icon shows for panoramas.
George Mount [Tue, 23 Oct 2012 16:33:20 +0000 (09:33 -0700)]
Ensure photo sphere icon shows for panoramas.

 Bug 7393844

Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63

11 years agoam add322b8: am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 16:01:04 +0000 (09:01 -0700)]
am add322b8: am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE

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

11 years agoam f924cac6: am caace51d: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 16:01:03 +0000 (09:01 -0700)]
am f924cac6: am caace51d: Import translations. DO NOT MERGE

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

11 years agoam 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:58:31 +0000 (08:58 -0700)]
am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '306176fbd21ece931ccff21bbe6cfa04a1cc751d':
  Import translations. DO NOT MERGE

11 years agoam caace51d: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:58:30 +0000 (08:58 -0700)]
am caace51d: Import translations. DO NOT MERGE

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

11 years agoam 822c182e: Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:58:04 +0000 (08:58 -0700)]
am 822c182e: Import translations. DO NOT MERGE

* commit '822c182e8a76e5e9fcbfdce5f4e1f65f2828d511':
  Import translations. DO NOT MERGE

11 years agoam 7c08064b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 15:57:00 +0000 (08:57 -0700)]
am 7c08064b: (-s ours) Import translations. DO NOT MERGE

* commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a':
  Import translations. DO NOT MERGE

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:55:17 +0000 (07:55 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:54:40 +0000 (07:54 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Oct 2012 14:53:21 +0000 (07:53 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 190c2285: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
John Hoford [Tue, 23 Oct 2012 03:04:02 +0000 (20:04 -0700)]
am 190c2285: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit '190c22855d5aaaf3485e22d1752a9ee799d9c048':
  on entry check if Tiny Planet if not remove UI

11 years agoam ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI
John Hoford [Tue, 23 Oct 2012 03:00:55 +0000 (20:00 -0700)]
am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit 'ea7366a517c9142a8e35d19a64e9964bb96ad2a8':
  on entry check if Tiny Planet if not remove UI

11 years agoam 5fbfe6f1: on entry check if Tiny Planet if not remove UI
John Hoford [Tue, 23 Oct 2012 02:58:11 +0000 (19:58 -0700)]
am 5fbfe6f1: on entry check if Tiny Planet if not remove UI

* commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79':
  on entry check if Tiny Planet if not remove UI

11 years agoon entry check if Tiny Planet if not remove UI
John Hoford [Mon, 22 Oct 2012 23:26:26 +0000 (16:26 -0700)]
on entry check if Tiny Planet if not remove UI

bug:7391885
Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83

11 years agoam 87091dd2: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera...
Mangesh Ghiware [Tue, 23 Oct 2012 01:49:54 +0000 (18:49 -0700)]
am 87091dd2: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches

* commit '87091dd2421773aa4a0ac0676b16785256041151':
  Add activity-alias for video camera

11 years agoam 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub...
Mangesh Ghiware [Tue, 23 Oct 2012 01:47:48 +0000 (18:47 -0700)]
am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches

* commit '4a138a84682c3554d553a4909dbf12d48c7ea144':
  Add activity-alias for video camera

11 years agoam 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
Mangesh Ghiware [Tue, 23 Oct 2012 01:44:26 +0000 (18:44 -0700)]
am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches

* commit '6377075221ef5b31c7f87e7f0103124e5177c2c3':
  Add activity-alias for video camera

11 years agoMerge "Add activity-alias for video camera" into gb-ub-photos-arches
Mangesh Ghiware [Tue, 23 Oct 2012 01:43:03 +0000 (18:43 -0700)]
Merge "Add activity-alias for video camera" into gb-ub-photos-arches

11 years agoam 7f887b96: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub...
Bobby Georgescu [Tue, 23 Oct 2012 01:08:18 +0000 (18:08 -0700)]
am 7f887b96: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit '7f887b9680ac1c190f47e31e59781c7b4f7080d3':
  Minor transition tweaks

11 years agoam 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:05:18 +0000 (18:05 -0700)]
am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit '0df51da9b67e1c66f0a85a475ce567c11b8d4aa1':
  Minor transition tweaks

11 years agoam afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:03:02 +0000 (18:03 -0700)]
am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches

* commit 'afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c':
  Minor transition tweaks

11 years agoam ee46cb04: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid...
Doris Liu [Tue, 23 Oct 2012 01:02:45 +0000 (18:02 -0700)]
am ee46cb04: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit 'ee46cb0465b385adf3602aff25636bbe036d68b6':
  Show panorama thumbs in Gallery grid view

11 years agoMerge "Minor transition tweaks" into gb-ub-photos-arches
Bobby Georgescu [Tue, 23 Oct 2012 01:00:44 +0000 (18:00 -0700)]
Merge "Minor transition tweaks" into gb-ub-photos-arches

11 years agoam 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into...
Doris Liu [Tue, 23 Oct 2012 01:00:36 +0000 (18:00 -0700)]
am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '7ad3eb28f0ab85669841c1b5589982834b465c1b':
  Show panorama thumbs in Gallery grid view

11 years agoam 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos...
Doris Liu [Tue, 23 Oct 2012 00:57:48 +0000 (17:57 -0700)]
am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

* commit '3a64ad361b9d48407abd902b26949d3c6b34af66':
  Show panorama thumbs in Gallery grid view

11 years agoMerge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
Doris Liu [Tue, 23 Oct 2012 00:55:57 +0000 (17:55 -0700)]
Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches

11 years agoMinor transition tweaks
Bobby Georgescu [Mon, 22 Oct 2012 22:28:04 +0000 (15:28 -0700)]
Minor transition tweaks

Bug: 7376109
Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c

11 years agoShow panorama thumbs in Gallery grid view
Doris Liu [Sat, 20 Oct 2012 02:16:14 +0000 (19:16 -0700)]
Show panorama thumbs in Gallery grid view

Bug: 7362229
Bug: 7378208

In addition to showing pano thumbs, this CL also removes the video play
icon on the top-level album view thumbnails.

Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b

11 years agoam f39fa25d: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon...
Hung-ying Tyan [Mon, 22 Oct 2012 23:27:21 +0000 (16:27 -0700)]
am f39fa25d: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit 'f39fa25d0f659048de00ce56364cf5900c3892af':
  Move new exif lib to gallerycommon.

11 years agoam 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub...
Hung-ying Tyan [Mon, 22 Oct 2012 23:25:08 +0000 (16:25 -0700)]
am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit '23cfddb44a19683b1f5a61200875048d7b916dd4':
  Move new exif lib to gallerycommon.

11 years agoam 31457215: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer...
John Reck [Mon, 22 Oct 2012 23:24:44 +0000 (16:24 -0700)]
am 31457215: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit '3145721500471079def676491547c0acb12b3e9c':
  Drive GLRootView with Choreographer

11 years agoam bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
Hung-ying Tyan [Mon, 22 Oct 2012 23:23:47 +0000 (16:23 -0700)]
am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

* commit 'bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468':
  Move new exif lib to gallerycommon.

11 years agoam fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub...
John Reck [Mon, 22 Oct 2012 23:22:40 +0000 (16:22 -0700)]
am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit 'fdfced2d4eb28e510926aa704921cfe2d6e170b5':
  Drive GLRootView with Choreographer

11 years agoMerge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
Hung-ying Tyan [Mon, 22 Oct 2012 23:22:21 +0000 (16:22 -0700)]
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches

11 years agoam ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:21:38 +0000 (16:21 -0700)]
am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

* commit 'ff4e0460b4cdeb329e37cb5f41eedc45717a17c4':
  Drive GLRootView with Choreographer

11 years agoMerge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
John Reck [Mon, 22 Oct 2012 23:19:52 +0000 (16:19 -0700)]
Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches

11 years agoDrive GLRootView with Choreographer
John Reck [Mon, 22 Oct 2012 23:11:01 +0000 (16:11 -0700)]
Drive GLRootView with Choreographer

 Bug: 7332724
 By routing requestRender through postOnAnimation we can drive
 the GLRootView's rendering with the UI thread's coreographer, which
 ensures that touch events are processed before drawing

Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c

11 years agoam 5fcadf44: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmst...
Bobby Georgescu [Mon, 22 Oct 2012 23:01:36 +0000 (16:01 -0700)]
am 5fcadf44: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit '5fcadf4460dce65aada82afb101ebd98d2f1985a':
  Scroll to placeholder in gallery filmstrip launches camera

11 years agoam b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches...
Bobby Georgescu [Mon, 22 Oct 2012 22:59:19 +0000 (15:59 -0700)]
am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit 'b21c127cf83ccc1bd86deb3fb35fea974e69957c':
  Scroll to placeholder in gallery filmstrip launches camera

11 years agoam e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into...
Bobby Georgescu [Mon, 22 Oct 2012 22:56:08 +0000 (15:56 -0700)]
am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

* commit 'e96e907a01c0d633828dade014f07a5b93b07356':
  Scroll to placeholder in gallery filmstrip launches camera

11 years agoMerge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos...
Bobby Georgescu [Mon, 22 Oct 2012 22:53:30 +0000 (15:53 -0700)]
Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches

11 years agoAdd activity-alias for video camera
Mangesh Ghiware [Mon, 22 Oct 2012 22:47:22 +0000 (15:47 -0700)]
Add activity-alias for video camera

Bug: 7390076
Change-Id: I4827f1b5412476075f89d714fe3f1bbe2576c357

11 years agoam d1472ac4: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into...
Ruben Brunk [Mon, 22 Oct 2012 22:27:22 +0000 (15:27 -0700)]
am d1472ac4: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit 'd1472ac4a61cfd46d2eeafb6daaf04ed78633721':
  Fix geometry xforms & minor bug.

11 years agoam 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos...
Ruben Brunk [Mon, 22 Oct 2012 22:25:08 +0000 (15:25 -0700)]
am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '91814c2e343b9a0b602e38816047bfd7cb58007c':
  Fix geometry xforms & minor bug.

11 years agoam 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Ruben Brunk [Mon, 22 Oct 2012 22:22:45 +0000 (15:22 -0700)]
am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

* commit '168db2f10069c3a15a9c3b9d0325cac0ae779b99':
  Fix geometry xforms & minor bug.

11 years agoMerge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
Ruben Brunk [Mon, 22 Oct 2012 22:20:55 +0000 (15:20 -0700)]
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches

11 years agoScroll to placeholder in gallery filmstrip launches camera
Bobby Georgescu [Mon, 22 Oct 2012 20:49:35 +0000 (13:49 -0700)]
Scroll to placeholder in gallery filmstrip launches camera

Bug: 7368079
Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97

11 years agoam 631ce787: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res...
Bobby Georgescu [Mon, 22 Oct 2012 21:54:20 +0000 (14:54 -0700)]
am 631ce787: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit '631ce7871e13dae09723d463cd4af71558fa0cb2':
  Increase album label size on high-res screens

11 years agoam cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into...
Bobby Georgescu [Mon, 22 Oct 2012 21:52:17 +0000 (14:52 -0700)]
am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit 'cfbbe15d8b927d3be388340c62cee5e5b3af850f':
  Increase album label size on high-res screens

11 years agoam 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos...
Bobby Georgescu [Mon, 22 Oct 2012 21:50:22 +0000 (14:50 -0700)]
am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

* commit '3536bd340f43edfc9f318df5f49e9319e62d0cc4':
  Increase album label size on high-res screens

11 years agoMerge "Increase album label size on high-res screens" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 21:48:42 +0000 (14:48 -0700)]
Merge "Increase album label size on high-res screens" into gb-ub-photos-arches

11 years agoam 7ab58ca5: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProv...
George Mount [Mon, 22 Oct 2012 21:42:19 +0000 (14:42 -0700)]
am 7ab58ca5: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit '7ab58ca5e8a13d3bdaf614bf37eaef42efb2aef1':
  Add null-check for StitchingServiceProvider.

11 years agoam f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into...
George Mount [Mon, 22 Oct 2012 21:40:04 +0000 (14:40 -0700)]
am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit 'f2272574dcefc4e1f369fbf0de55559d1548c741':
  Add null-check for StitchingServiceProvider.

11 years agoam 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos...
George Mount [Mon, 22 Oct 2012 21:37:09 +0000 (14:37 -0700)]
am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

* commit '58d326ea368ae275f03ec158a9ec5f9d2965593a':
  Add null-check for StitchingServiceProvider.

11 years agoMerge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
George Mount [Mon, 22 Oct 2012 21:35:50 +0000 (14:35 -0700)]
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches

11 years agoam 359155c5: am 1d25a687: am 73c89b45: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 22 Oct 2012 21:34:40 +0000 (14:34 -0700)]
am 359155c5: am 1d25a687: am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '359155c578c0a1ec6c5653ec8a01b36c6141fd98':
  Import translations. DO NOT MERGE

11 years agoam 1d25a687: am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into...
Baligh Uddin [Mon, 22 Oct 2012 21:32:26 +0000 (14:32 -0700)]
am 1d25a687: am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '1d25a68700185f2126dc387a28c0d966853e8776':
  Import translations. DO NOT MERGE

11 years agoam de825fc8: am 2ed15703: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 21:31:13 +0000 (14:31 -0700)]
am de825fc8: am 2ed15703: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

11 years agoam 2bdf77dc: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 22 Oct 2012 21:31:11 +0000 (14:31 -0700)]
am 2bdf77dc: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '2bdf77dc44cc34d02eae54e467d10fdfdd7ed1a6':
  Import translations. DO NOT MERGE

11 years agoam 2ed15703: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 21:30:00 +0000 (14:30 -0700)]
am 2ed15703: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2ed15703c06d1b4691737475f127eecbffa056e9':
  Import translations. DO NOT MERGE

11 years agoam 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Mon, 22 Oct 2012 21:29:55 +0000 (14:29 -0700)]
am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '73c89b45b122cbdcbcffa618f0fa2386829d710a':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Mon, 22 Oct 2012 21:29:07 +0000 (14:29 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Mon, 22 Oct 2012 21:27:35 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 21:27:14 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoIncrease album label size on high-res screens
Bobby Georgescu [Mon, 22 Oct 2012 21:18:32 +0000 (14:18 -0700)]
Increase album label size on high-res screens

Bug: 7382498
Change-Id: I50f5f7c6006fed493918c05f2eb7d2cf3ade3947

11 years agoFix geometry xforms & minor bug.
Ruben Brunk [Fri, 19 Oct 2012 06:39:18 +0000 (23:39 -0700)]
Fix geometry xforms & minor bug.

Bug: 7376048

Fixed geometry transform.  Fixed minor bug where the foldername
for saved edited images was incorrect.

Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3

11 years agoAdd null-check for StitchingServiceProvider.
George Mount [Mon, 22 Oct 2012 18:39:25 +0000 (11:39 -0700)]
Add null-check for StitchingServiceProvider.

 Bug 7386827

Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03

11 years agoam c7c829c5: am 34347598: am 1dace572: Merge "Better transition between Gallery and...
Bobby Georgescu [Mon, 22 Oct 2012 18:31:41 +0000 (11:31 -0700)]
am c7c829c5: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit 'c7c829c5dc1208984ff0e5953e9a02a9162efc17':
  Better transition between Gallery and editor

11 years agoam 8fbca580: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings...
Ruben Brunk [Mon, 22 Oct 2012 18:31:40 +0000 (11:31 -0700)]
am 8fbca580: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '8fbca580f219eb88afb263936ea78e38ec93d416':
  Fix to ensure visible history adapter strings are from xml.

11 years agoam 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into...
Bobby Georgescu [Mon, 22 Oct 2012 18:29:04 +0000 (11:29 -0700)]
am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit '3434759816cea392a78df62a1ad3d0151163510a':
  Better transition between Gallery and editor

11 years agoam 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from...
Ruben Brunk [Mon, 22 Oct 2012 18:29:03 +0000 (11:29 -0700)]
am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '85930f99d020b9b8bac7bd29cf77434c034d152a':
  Fix to ensure visible history adapter strings are from xml.

11 years agoam 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos...
Bobby Georgescu [Mon, 22 Oct 2012 18:26:39 +0000 (11:26 -0700)]
am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

* commit '1dace572562075e755823bbb7b02d09bb6ca1259':
  Better transition between Gallery and editor

11 years agoam 0a32b7af: Fix to ensure visible history adapter strings are from xml.
Ruben Brunk [Mon, 22 Oct 2012 18:26:37 +0000 (11:26 -0700)]
am 0a32b7af: Fix to ensure visible history adapter strings are from xml.

* commit '0a32b7afc5286a5c7aa334b9338591d61a49731f':
  Fix to ensure visible history adapter strings are from xml.

11 years agoMerge "Better transition between Gallery and editor" into gb-ub-photos-arches
Bobby Georgescu [Mon, 22 Oct 2012 18:25:46 +0000 (11:25 -0700)]
Merge "Better transition between Gallery and editor" into gb-ub-photos-arches

11 years agoFix to ensure visible history adapter strings are from xml.
Ruben Brunk [Sat, 20 Oct 2012 01:48:22 +0000 (18:48 -0700)]
Fix to ensure visible history adapter strings are from xml.

Bug: 7379327
Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1

11 years agoBetter transition between Gallery and editor
Bobby Georgescu [Mon, 22 Oct 2012 18:13:34 +0000 (11:13 -0700)]
Better transition between Gallery and editor

Bug: 7346155
Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf

11 years agoam 006b03cd: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state...
nicolasroard [Mon, 22 Oct 2012 16:56:38 +0000 (09:56 -0700)]
am 006b03cd: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

* commit '006b03cdaebbe7c57cd34bf2c9b24ae9fd8d9896':
  Fix the undo/redo/reset menu item state

11 years agoam cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb...
nicolasroard [Mon, 22 Oct 2012 16:51:41 +0000 (09:51 -0700)]
am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches

* commit 'cd8014124cb3b9354155d84cfc45811280e7d24b':
  Fix the undo/redo/reset menu item state