OSDN Git Service

android-x86/packages-apps-Gallery2.git
11 years agoam 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into...
Bobby Georgescu [Fri, 5 Oct 2012 22:38:40 +0000 (15:38 -0700)]
am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches

* commit '39e5dfdd15055f2f96f45b1afd9c705f27a6d911':
  Set the thumbnail/screennail sizes based on screensize

11 years agoMerge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos...
Bobby Georgescu [Fri, 5 Oct 2012 22:37:40 +0000 (15:37 -0700)]
Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches

11 years agoSet the thumbnail/screennail sizes based on screensize
Bobby Georgescu [Thu, 4 Oct 2012 21:04:13 +0000 (14:04 -0700)]
Set the thumbnail/screennail sizes based on screensize

Bug: 7232758
Prior to this CL, the thumbnail and screennail sizes were
hardcoded which resulted in mediocre image quality when
using the Gallery in general and the camera filmstrip.
Now, we set the size of these items based on the resolution
of the display. Because high-resolution devices tend to
have higher-performance graphics to drive their large
displays, we expect that this will not introduce any
significant performance impact.

Change-Id: I90e08f7aca670e275c913fd9e21e4459c8bf9fcf

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Oct 2012 22:23:36 +0000 (15:23 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

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

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

11 years agoam a6591448: Don\'t film strip animate when switching cameras
John Reck [Fri, 5 Oct 2012 20:50:07 +0000 (13:50 -0700)]
am a6591448: Don\'t film strip animate when switching cameras

* commit 'a65914485de7b82b96b616c7be738ab952e09c83':
  Don't film strip animate when switching cameras

11 years agoDon't film strip animate when switching cameras
John Reck [Fri, 5 Oct 2012 20:15:54 +0000 (13:15 -0700)]
Don't film strip animate when switching cameras

 Bug: 7265781

Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540

11 years agoam 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 19:31:48 +0000 (12:31 -0700)]
am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches

* commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58':
  New UI...

11 years agoMerge "New UI..." into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 19:30:24 +0000 (12:30 -0700)]
Merge "New UI..." into gb-ub-photos-arches

11 years agoNew UI...
nicolasroard [Fri, 5 Oct 2012 10:48:34 +0000 (03:48 -0700)]
New UI...

bug:7289525
bug:7289361

Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 18:47:58 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 18:47:35 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

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

11 years agoDo not replace existed tag in addTag() of ExifTag
Earl Ou [Wed, 26 Sep 2012 03:40:18 +0000 (11:40 +0800)]
Do not replace existed tag in addTag() of ExifTag

Change-Id: I4136ed018db1ccf5801b2a151e65703cf97d3289

11 years agoam e29fc4a5: Upload screennails in tiles to prevent jank
Owen Lin [Fri, 5 Oct 2012 03:50:22 +0000 (20:50 -0700)]
am e29fc4a5: Upload screennails in tiles to prevent jank

* commit 'e29fc4a51b99f12f7fae13fae272858df2e1af36':
  Upload screennails in tiles to prevent jank

11 years agoUpload screennails in tiles to prevent jank
Owen Lin [Mon, 24 Sep 2012 03:20:34 +0000 (11:20 +0800)]
Upload screennails in tiles to prevent jank

bug: 6399444

Change-Id: Id2338db34d7f87fbabd7861f78b42f2a81d9794b

11 years agoam 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub...
Hung-ying Tyan [Fri, 5 Oct 2012 02:35:43 +0000 (19:35 -0700)]
am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches

* commit '9bcba5b049f199ad78051c2ad27897cad389679d':
  Open album in filmstrip only if the item exists.

11 years agoMerge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
Hung-ying Tyan [Fri, 5 Oct 2012 02:33:35 +0000 (19:33 -0700)]
Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches

11 years agoam f47e790e: Add a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:53:57 +0000 (17:53 -0700)]
am f47e790e: Add a reset item menu

* commit 'f47e790e3f3553f69abe054eec20bd7585118843':
  Add a reset item menu

11 years agoAdd a reset item menu
nicolasroard [Fri, 5 Oct 2012 00:50:20 +0000 (17:50 -0700)]
Add a reset item menu

bug:7234317
Change-Id: I3129b16f83981ab22ce17341d8401822369686eb

11 years agoam b559b2dd: add vibrance fix a free in shadows
John Hoford [Fri, 5 Oct 2012 00:34:42 +0000 (17:34 -0700)]
am b559b2dd: add vibrance fix a free in shadows

* commit 'b559b2dd6637660ddbbdbae79a742c9f0fb1180b':
  add vibrance fix a free in shadows

11 years agoadd vibrance fix a free in shadows
John Hoford [Thu, 4 Oct 2012 21:12:36 +0000 (14:12 -0700)]
add vibrance fix a free in shadows

bug:7234321
Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2

11 years agoam 5448bf80: Implement sharpen
nicolasroard [Fri, 5 Oct 2012 00:21:29 +0000 (17:21 -0700)]
am 5448bf80: Implement sharpen

* commit '5448bf8095483574649afcc2add7f153670c7450':
  Implement sharpen

11 years agoImplement sharpen
nicolasroard [Wed, 3 Oct 2012 04:57:22 +0000 (21:57 -0700)]
Implement sharpen

bug:7279964
bug:7247494
bug:7234321

- add a sharpen filter
- add infrastructure to use RenderScript
- some refactoring (add an ImageSlave class)
- add new zoom UI

Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01

11 years agoam 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 23:18:53 +0000 (16:18 -0700)]
am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches

* commit '94805da05624e939ff402a9586cddacaf622a716':
  Fix build break in tests

11 years agoMerge "Fix build break in tests" into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 23:17:19 +0000 (16:17 -0700)]
Merge "Fix build break in tests" into gb-ub-photos-arches

11 years agoFix build break in tests
George Mount [Thu, 4 Oct 2012 22:57:20 +0000 (15:57 -0700)]
Fix build break in tests

 Bug 7259843

Change-Id: If40a7da72261039e3d6fcd3a00669ed7c900c658

11 years agoam d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Thu, 4 Oct 2012 22:52:42 +0000 (15:52 -0700)]
am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 4 Oct 2012 22:50:54 +0000 (15:50 -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 [Thu, 4 Oct 2012 22:50:35 +0000 (15:50 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam 9c6c01dd: Fix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:17:28 +0000 (15:17 -0700)]
am 9c6c01dd: Fix build. Missing dummy class for Gallery2.

* commit '9c6c01ddd5b7fce725bf4b3cec317820b16963b8':
  Fix build. Missing dummy class for Gallery2.

11 years agoFix build. Missing dummy class for Gallery2.
George Mount [Thu, 4 Oct 2012 22:04:23 +0000 (15:04 -0700)]
Fix build. Missing dummy class for Gallery2.

 Bug 7259843

Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614

11 years agoam 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos...
George Mount [Thu, 4 Oct 2012 21:46:01 +0000 (14:46 -0700)]
am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches

* commit '29b553a54cbe4d95c174121e4f956a74117a4fc9':
  Support panorama progress items in Gallery.

11 years agoMerge "Support panorama progress items in Gallery." into gb-ub-photos-arches
George Mount [Thu, 4 Oct 2012 21:44:34 +0000 (14:44 -0700)]
Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches

11 years agoam 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into...
Bobby Georgescu [Thu, 4 Oct 2012 21:04:25 +0000 (14:04 -0700)]
am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches

* commit '8a415f457fe9fd18b369ac4ec354a33e3affcb94':
  Don't allow switching to filmstrip in get content intent

11 years agoMerge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos...
Bobby Georgescu [Thu, 4 Oct 2012 21:02:36 +0000 (14:02 -0700)]
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches

11 years agoam 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos...
Bobby Georgescu [Thu, 4 Oct 2012 20:55:02 +0000 (13:55 -0700)]
am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches

* commit '0eefb1733f5ff2e2f6f4846bdbd8873639b4d085':
  Upscale images to fill screen for slideshow

11 years agoMerge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
Bobby Georgescu [Thu, 4 Oct 2012 20:54:04 +0000 (13:54 -0700)]
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches

11 years agoUpscale images to fill screen for slideshow
Bobby Georgescu [Thu, 4 Oct 2012 20:22:05 +0000 (13:22 -0700)]
Upscale images to fill screen for slideshow

Bug: 7110382
This fixes the slideshow mode on high-resolution
displays. Note that this will scale up screennails
to fill the screen even if they are fairly low quality.
The resolution to 7232758 will set the size of the
screennails appropriately based on screen size.

Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10

11 years agoDon't allow switching to filmstrip in get content intent
Bobby Georgescu [Thu, 4 Oct 2012 18:59:01 +0000 (11:59 -0700)]
Don't allow switching to filmstrip in get content intent

Bug: 7288252
Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1

11 years agoam b1a51397: Snap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:47:16 +0000 (11:47 -0700)]
am b1a51397: Snap back photo after swipe in y-direction in filmstrip

* commit 'b1a513974d59c1dc14e004338b6795d6c3c5e5e8':
  Snap back photo after swipe in y-direction in filmstrip

11 years agoSupport panorama progress items in Gallery.
Angus Kong [Wed, 19 Sep 2012 12:39:45 +0000 (20:39 +0800)]
Support panorama progress items in Gallery.

 Bug 7259843
 Add dummy files for showing panorama progress in filmstrip.

Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 18:41:21 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 18:40:56 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE

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

11 years agoSnap back photo after swipe in y-direction in filmstrip
Bobby Georgescu [Thu, 4 Oct 2012 18:15:43 +0000 (11:15 -0700)]
Snap back photo after swipe in y-direction in filmstrip

Bug: 7283537
Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c

11 years agoam 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
Pin Ting [Thu, 4 Oct 2012 13:55:46 +0000 (06:55 -0700)]
am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches

* commit '2abc1350cde24e810f6437592f099c149ce19ada':
  Accelerate PNG image rendering.

11 years agoMerge "Accelerate PNG image rendering." into gb-ub-photos-arches
Pin Ting [Thu, 4 Oct 2012 13:54:47 +0000 (06:54 -0700)]
Merge "Accelerate PNG image rendering." into gb-ub-photos-arches

11 years agoOpen album in filmstrip only if the item exists.
Hung-ying Tyan [Thu, 4 Oct 2012 10:49:01 +0000 (18:49 +0800)]
Open album in filmstrip only if the item exists.

Metadata of picasa photos may not be available when user taps to view a picasa
album. Cannot enter PhotoPage directly in such a case.

Bug: 7213464
Change-Id: Ife2e8768fc9b8d8757235610a02f029f40205b5b

11 years agoAccelerate PNG image rendering.
Pin Ting [Thu, 4 Oct 2012 08:54:50 +0000 (16:54 +0800)]
Accelerate PNG image rendering.

Bug:7137662
Change-Id: I050a228a6c8031c6a2d068eb4ba1b39be86e9f4a

11 years agoam accef756: Fix NPE in ImageLoader.
Owen Lin [Thu, 4 Oct 2012 08:46:47 +0000 (01:46 -0700)]
am accef756: Fix NPE in ImageLoader.

* commit 'accef756f100d5c27a4d13d6a6bfa5c75714e5bc':
  Fix NPE in ImageLoader.

11 years agoFix NPE in ImageLoader.
Owen Lin [Thu, 4 Oct 2012 08:15:07 +0000 (16:15 +0800)]
Fix NPE in ImageLoader.

bug: 7275805
Change-Id: Ied04553a97efe5b4996418f20d834d6bd0893976

11 years agoam fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches
Owen Lin [Thu, 4 Oct 2012 07:42:28 +0000 (00:42 -0700)]
am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches

* commit 'fab36399a0fa455377854d65fab012ee6ee55868':
  Set type as well while launching editor.

11 years agoMerge "Set type as well while launching editor." into gb-ub-photos-arches
Owen Lin [Thu, 4 Oct 2012 07:41:13 +0000 (00:41 -0700)]
Merge "Set type as well while launching editor." into gb-ub-photos-arches

11 years agoam 9778705a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 04:55:54 +0000 (21:55 -0700)]
am 9778705a: (-s ours) Import translations. DO NOT MERGE

* commit '9778705aa8ea34a9bff27f9d77ac46d35514278a':
  Import translations. DO NOT MERGE

11 years agoSet type as well while launching editor.
Owen Lin [Thu, 4 Oct 2012 03:26:30 +0000 (11:26 +0800)]
Set type as well while launching editor.

bug: 7275805
Change-Id: I6b86dd03d92b2cf453947bd84a0247e1626c81db

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 00:22:02 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Oct 2012 00:21:38 +0000 (17:21 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama...
Mangesh Ghiware [Wed, 3 Oct 2012 23:00:13 +0000 (16:00 -0700)]
am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches

* commit '6090237f178914fa7d7eef514c2e2512d4c27847':
  Revert "Add a overflow menu item to view 360-degree panorama."

11 years agoMerge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub...
Mangesh Ghiware [Wed, 3 Oct 2012 22:58:41 +0000 (15:58 -0700)]
Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches

11 years agoRevert "Add a overflow menu item to view 360-degree panorama."
Mangesh Ghiware [Wed, 3 Oct 2012 22:48:54 +0000 (15:48 -0700)]
Revert "Add a overflow menu item to view 360-degree panorama."

This reverts commit d84ae72adb147c0e8517a438b3dea3e87d319bb7

Change-Id: I5921cbb476034da2798480534e9084e287312f04

11 years agoam 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 21:45:41 +0000 (14:45 -0700)]
am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches

* commit '124a9d3f2adc08fdef179e1922762d024d27fd69':
  Fix ANR in image editor

11 years agoMerge "Fix ANR in image editor" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 21:44:12 +0000 (14:44 -0700)]
Merge "Fix ANR in image editor" into gb-ub-photos-arches

11 years agoFix ANR in image editor
nicolasroard [Wed, 3 Oct 2012 21:30:11 +0000 (14:30 -0700)]
Fix ANR in image editor

bug:7275425
Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa

11 years agoam 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Wed, 3 Oct 2012 21:14:28 +0000 (14:14 -0700)]
am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches

* commit '56bc8b742d750f2fff9d3a30e6cc96e1850c782d':
  Fix snapping behavior in filmstrip

11 years agoMerge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
Bobby Georgescu [Wed, 3 Oct 2012 21:13:10 +0000 (14:13 -0700)]
Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches

11 years agoFix snapping behavior in filmstrip
Bobby Georgescu [Wed, 3 Oct 2012 20:31:33 +0000 (13:31 -0700)]
Fix snapping behavior in filmstrip

Bug: 7277936
Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a

11 years agoam b57e72bb: Disable destructive rotate for lightcycle panorama
Mangesh Ghiware [Wed, 3 Oct 2012 20:10:46 +0000 (13:10 -0700)]
am b57e72bb: Disable destructive rotate for lightcycle panorama

* commit 'b57e72bb1a093afc5aee276855656c8b285c73b3':
  Disable destructive rotate for lightcycle panorama

11 years agoDisable destructive rotate for lightcycle panorama
Mangesh Ghiware [Wed, 3 Oct 2012 05:45:14 +0000 (22:45 -0700)]
Disable destructive rotate for lightcycle panorama

Bug: 7276024
Change-Id: I2b223d3928517b083cc982db8142770da02dd5b9

11 years agoam d84ae72a: Add a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 19:45:33 +0000 (12:45 -0700)]
am d84ae72a: Add a overflow menu item to view 360-degree panorama.

* commit 'd84ae72adb147c0e8517a438b3dea3e87d319bb7':
  Add a overflow menu item to view 360-degree panorama.

11 years agoAdd a overflow menu item to view 360-degree panorama.
Mangesh Ghiware [Wed, 3 Oct 2012 06:26:29 +0000 (23:26 -0700)]
Add a overflow menu item to view 360-degree panorama.

Bug: 7276026
Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4

11 years agoam 217acd7c: Change LightCycle assets.
George Mount [Wed, 3 Oct 2012 18:32:59 +0000 (11:32 -0700)]
am 217acd7c: Change LightCycle assets.

* commit '217acd7c338871f426f4c975a8f9b889275cd321':
  Change LightCycle assets.

11 years agoChange LightCycle assets.
George Mount [Wed, 3 Oct 2012 17:46:16 +0000 (10:46 -0700)]
Change LightCycle assets.

 Bug 7279463

Change-Id: Ic0253875b5554649004beeaf6b73795c304b5369

11 years agoam e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos...
Baligh Uddin [Wed, 3 Oct 2012 15:29:09 +0000 (08:29 -0700)]
am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

11 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 3 Oct 2012 15:27:58 +0000 (08:27 -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, 3 Oct 2012 15:27:25 +0000 (08:27 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

11 years agoam f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage
Bobby Georgescu [Wed, 3 Oct 2012 07:18:44 +0000 (00:18 -0700)]
am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage

* commit 'f4e22eb44bfae0c2a3b6570f19480c8c3535d808':
  Correct behavior when swiping to placeholder item in PhotoPage

11 years agoCorrect behavior when swiping to placeholder item in PhotoPage
Bobby Georgescu [Wed, 3 Oct 2012 01:34:08 +0000 (18:34 -0700)]
Correct behavior when swiping to placeholder item in PhotoPage

Bug: 7261641
Change-Id: I54deed0f20a4673cb5470ffc128c73cddc071772

11 years agoam 847587b5: Remove redundant handling of share action.
Mangesh Ghiware [Wed, 3 Oct 2012 07:07:24 +0000 (00:07 -0700)]
am 847587b5: Remove redundant handling of share action.

* commit '847587b51800d4b2d241cd1b7c8b589be2c24133':
  Remove redundant handling of share action.

11 years agoRemove redundant handling of share action.
Mangesh Ghiware [Wed, 3 Oct 2012 06:50:53 +0000 (23:50 -0700)]
Remove redundant handling of share action.

Bug: 7256214

Gallery PhotoPage was handling the menu item selection for the share
action, in addition to the ShareActionProvider. Removing this leftover
code from pre-ActionBar implementation.

Change-Id: I0c91b9a7c05b38758ad1b76dd657225daaab1922

11 years agoam c7b2c287: Add Shadow feature
John Hoford [Wed, 3 Oct 2012 02:28:57 +0000 (19:28 -0700)]
am c7b2c287: Add Shadow feature

* commit 'c7b2c287bfbe3f53a4d65800c3884b0082ad683c':
  Add Shadow feature

11 years agoAdd Shadow feature
John Hoford [Wed, 3 Oct 2012 01:12:03 +0000 (18:12 -0700)]
Add Shadow feature

bug:7234321
Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297

11 years agoam 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 00:32:06 +0000 (17:32 -0700)]
am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches

* commit '45e666c65b75d36327c3491fb8e1245ba5cf4c77':
  Implements image sharing

11 years agoMerge "Implements image sharing" into gb-ub-photos-arches
nicolasroard [Wed, 3 Oct 2012 00:29:49 +0000 (17:29 -0700)]
Merge "Implements image sharing" into gb-ub-photos-arches

11 years agoImplements image sharing
nicolasroard [Mon, 1 Oct 2012 07:25:11 +0000 (00:25 -0700)]
Implements image sharing

bug:7233986
Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e

11 years agoam 9481d05b: Do not show grid/filmstrip spinner in secure camera mode
Bobby Georgescu [Wed, 3 Oct 2012 00:17:41 +0000 (17:17 -0700)]
am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode

* commit '9481d05b0782dccd495c66d2e3240cd7448bbd4a':
  Do not show grid/filmstrip spinner in secure camera mode

11 years agoDo not show grid/filmstrip spinner in secure camera mode
Bobby Georgescu [Tue, 2 Oct 2012 23:28:20 +0000 (16:28 -0700)]
Do not show grid/filmstrip spinner in secure camera mode

Bug: 7274284
Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123

11 years agoam 45f089d6: Show Camera placeholder as first filmstrip item in roll
Bobby Georgescu [Tue, 2 Oct 2012 22:53:02 +0000 (15:53 -0700)]
am 45f089d6: Show Camera placeholder as first filmstrip item in roll

* commit '45f089d69141e3fb0dfaad9bc34d275b61eb2aee':
  Show Camera placeholder as first filmstrip item in roll

11 years agoShow Camera placeholder as first filmstrip item in roll
Bobby Georgescu [Tue, 2 Oct 2012 20:30:09 +0000 (13:30 -0700)]
Show Camera placeholder as first filmstrip item in roll

Bug: 7272674
The camera roll filmstrip view now shows a shortcut to
launch the camera when opened from the Gallery app.
Note: the edits to SnailAlbum and SnailSource were made to
allow sharing code between SingleItemAlbum and SnailAlbum

Change-Id: I1bd2f3db99138c4b79a41c9c5baee46704cd18e0

11 years agoam 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub...
Teng-Hui Zhu [Tue, 2 Oct 2012 20:58:06 +0000 (13:58 -0700)]
am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

* commit '51915a622bbd32e90f0cd43b69a7851e13825737':
  Trimming: Exit current activity after click done

11 years agoMerge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
Teng-Hui Zhu [Tue, 2 Oct 2012 20:56:24 +0000 (13:56 -0700)]
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches

11 years agoam 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:51:53 +0000 (13:51 -0700)]
am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches

* commit '536ff1512fae7c8ad6ee276bf102269011fb6e50':
  Fix NFC regression

11 years agoMerge "Fix NFC regression" into gb-ub-photos-arches
John Reck [Tue, 2 Oct 2012 20:51:03 +0000 (13:51 -0700)]
Merge "Fix NFC regression" into gb-ub-photos-arches

11 years agoFix NFC regression
John Reck [Tue, 2 Oct 2012 20:38:22 +0000 (13:38 -0700)]
Fix NFC regression

 Bug: 7263536

Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:19:13 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Oct 2012 20:18:50 +0000 (13:18 -0700)]
Import translations. DO NOT MERGE

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

11 years agoam 6423defe: Fix crash, remove logging added to diagnose bug
Bobby Georgescu [Tue, 2 Oct 2012 19:37:23 +0000 (12:37 -0700)]
am 6423defe: Fix crash, remove logging added to diagnose bug

* commit '6423defee1d8ccf4d462d40ae4f82c7d73b11ab5':
  Fix crash, remove logging added to diagnose bug

11 years agoFix crash, remove logging added to diagnose bug
Bobby Georgescu [Tue, 2 Oct 2012 18:41:25 +0000 (11:41 -0700)]
Fix crash, remove logging added to diagnose bug

Bug: 7216012
LocalMergeAlbum index was not being initialized
in constructor so it was possible to access the
index before it was populated with information.

Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c

11 years agoTrimming: Exit current activity after click done
Teng-Hui Zhu [Tue, 2 Oct 2012 18:21:37 +0000 (11:21 -0700)]
Trimming: Exit current activity after click done

Don't auto exit the trimmed video playing.
bug:7093055

Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8

11 years agoam 462923e5: Check item is editable before attempting to launch editor
Bobby Georgescu [Tue, 2 Oct 2012 17:43:13 +0000 (10:43 -0700)]
am 462923e5: Check item is editable before attempting to launch editor

* commit '462923e5800e151ab5ec450063334ba430c1da3a':
  Check item is editable before attempting to launch editor

11 years agoCheck item is editable before attempting to launch editor
Bobby Georgescu [Tue, 2 Oct 2012 17:30:07 +0000 (10:30 -0700)]
Check item is editable before attempting to launch editor

Bug: 7269840
Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057