OSDN Git Service

android-x86/packages-apps-Gallery2.git
12 years agoAdding Crop, Rotate, Flip.
Ruben Brunk [Thu, 27 Sep 2012 19:38:08 +0000 (12:38 -0700)]
Adding Crop, Rotate, Flip.

Bug: 7224232
Bug: 7218935

Adding geometry manipulation UI features.

Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0

12 years agoShare only 360-degree panoramas with new MIME type
Mangesh Ghiware [Mon, 8 Oct 2012 06:55:43 +0000 (23:55 -0700)]
Share only 360-degree panoramas with new MIME type

Bug: 7302972

Instead of using the UsePanoramaViewer attribute in XMP metadata,
ensure that the panorama is full 360 degree by checking if the
cropped width is same as the full panorama width.

Change-Id: I66d864df96052f96db5fa19fb02b3abe214b4dec

12 years agoLaunch correct photo when tapping grid item in Camera roll
Bobby Georgescu [Mon, 8 Oct 2012 06:06:05 +0000 (23:06 -0700)]
Launch correct photo when tapping grid item in Camera roll

Bug: 7303049
Change-Id: Ie3dd2b010d60669cd000a2ed9b52e0611b0977bd

12 years agoMerge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
Owen Lin [Mon, 8 Oct 2012 03:14:46 +0000 (20:14 -0700)]
Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches

12 years agoNo Camera recenter on resume after editing or viewing items
Bobby Georgescu [Sun, 7 Oct 2012 23:25:54 +0000 (16:25 -0700)]
No Camera recenter on resume after editing or viewing items

Bug: 7302361
Change-Id: I7420f89a766dc86d873166789b1875539541825c

12 years agoMerge "Show progress indicator dialog when saving edited image" into gb-ub-photos...
Bobby Georgescu [Sun, 7 Oct 2012 23:35:01 +0000 (16:35 -0700)]
Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches

12 years agoShow progress indicator dialog when saving edited image
Bobby Georgescu [Sun, 7 Oct 2012 22:20:44 +0000 (15:20 -0700)]
Show progress indicator dialog when saving edited image

Bug: 7301277
Change-Id: Ied4f9abeeaa950a0c78c0a652b3be4634dd96ce3

12 years agoMerge "Show stitched panorama in secure album." into gb-ub-photos-arches
George Mount [Sun, 7 Oct 2012 21:09:56 +0000 (14:09 -0700)]
Merge "Show stitched panorama in secure album." into gb-ub-photos-arches

12 years agoFix orientation locking issues when going back to Camera
Bobby Georgescu [Sun, 7 Oct 2012 20:34:57 +0000 (13:34 -0700)]
Fix orientation locking issues when going back to Camera

Bug: 7287039
Change-Id: Ib993266706b24269fd759f1ded1b6a85c2c5c7ba

12 years agoMerge "Change display of 360 panorama button" into gb-ub-photos-arches
Bobby Georgescu [Sun, 7 Oct 2012 19:15:56 +0000 (12:15 -0700)]
Merge "Change display of 360 panorama button" into gb-ub-photos-arches

12 years agoShow stitched panorama in secure album.
Wu-cheng Li [Sun, 7 Oct 2012 13:43:12 +0000 (21:43 +0800)]
Show stitched panorama in secure album.

bug:7285105
Change-Id: I36801d4e5b19cceb10600d41a3a3c78244c5ee4a

12 years agoImplement new grid layout in Gallery
Bobby Georgescu [Sun, 7 Oct 2012 02:12:20 +0000 (19:12 -0700)]
Implement new grid layout in Gallery

Bug: 7300836
Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31

12 years agoChange display of 360 panorama button
Bobby Georgescu [Sat, 6 Oct 2012 22:22:03 +0000 (15:22 -0700)]
Change display of 360 panorama button

Bug: 7300866
-Move pano button to center and make larger
-Pano button visible even when in full-screen mode
-Show edit button only when image editor is available
-Correctly hide bottom controls when switching from
 filmstrip mode to grid mode
Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc

12 years agoTune swipe to delete in filmstrip
Bobby Georgescu [Sun, 7 Oct 2012 00:39:23 +0000 (17:39 -0700)]
Tune swipe to delete in filmstrip

Bug: 7277872
Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d

12 years agoMerge "Animation support" into gb-ub-photos-arches
John Reck [Sat, 6 Oct 2012 23:35:11 +0000 (16:35 -0700)]
Merge "Animation support" into gb-ub-photos-arches

12 years agoAnimation support
John Reck [Sat, 6 Oct 2012 23:15:52 +0000 (16:15 -0700)]
Animation support

 Bug: 7300696

Change-Id: I80bfb27114a06dfc6f0f1aa866224cd547cc929d

12 years agoMerge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos...
Bobby Georgescu [Sat, 6 Oct 2012 22:05:42 +0000 (15:05 -0700)]
Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches

12 years agoChange LOCAL_SDK_VERSION to current.
Wu-cheng Li [Sat, 6 Oct 2012 19:29:50 +0000 (03:29 +0800)]
Change LOCAL_SDK_VERSION to current.

bug:7208909

Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57

12 years agoMerge "Move LightCycle undo to settings area." into gb-ub-photos-arches
George Mount [Sat, 6 Oct 2012 19:25:08 +0000 (12:25 -0700)]
Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches

12 years agoFix display of spinner and SQL exception for view intent
Bobby Georgescu [Sat, 6 Oct 2012 08:06:43 +0000 (01:06 -0700)]
Fix display of spinner and SQL exception for view intent

Bug: 7288544
Bug: 7219163
Remove the query for photo DISPLAY_NAME in view intent
since it is no longer used, and hide the spinner when
launching PhotoPage via this intent.

Change-Id: Id41ff3d623e7fd2e708b1042782333b48e8ba4a7

12 years agoRevert "Upload screennails in tiles to prevent jank"
Bart Sears [Sat, 6 Oct 2012 18:19:14 +0000 (11:19 -0700)]
Revert "Upload screennails in tiles to prevent jank"

This CL is reported to cause images to not be displayed correctly when opened via the view intent.

Bug: 7299123

This reverts commit e29fc4a51b99f12f7fae13fae272858df2e1af36

Change-Id: I5052548a826c275cb4559eeb4721c19f06861b3d

12 years agoMove LightCycle undo to settings area.
George Mount [Fri, 5 Oct 2012 23:17:13 +0000 (16:17 -0700)]
Move LightCycle undo to settings area.

 Bug 7294328

Change-Id: I7bfbcf030f9c4e70b58b47ddab328a9063af007e

12 years agoMerge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
nicolasroard [Fri, 5 Oct 2012 23:20:49 +0000 (16:20 -0700)]
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches

12 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Baligh Uddin [Fri, 5 Oct 2012 23:12:42 +0000 (16:12 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

12 years agoAdd scale factor / quality parameters in filters
nicolasroard [Fri, 5 Oct 2012 22:55:56 +0000 (15:55 -0700)]
Add scale factor / quality parameters in filters

bug:7248352
Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d

12 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

12 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

12 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

12 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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Oct 2012 20:04:51 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE

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

12 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

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

bug:7289525
bug:7289361

Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f

12 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

12 years agoFix ANR in creating the fallback animation.
Owen Lin [Fri, 5 Oct 2012 10:01:21 +0000 (18:01 +0800)]
Fix ANR in creating the fallback animation.

bug: 6620501
Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

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

bug:7233986
Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 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

12 years agoRemove ActionBarSherlock
Owen Lin [Tue, 2 Oct 2012 07:27:00 +0000 (15:27 +0800)]
Remove ActionBarSherlock

bug: 7242682

Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb

12 years agoMerge "Update assets of the lock screen image in the secure album." into gb-ub-photos...
Wu-cheng Li [Tue, 2 Oct 2012 04:51:52 +0000 (21:51 -0700)]
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches

12 years agoMerge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
George Mount [Tue, 2 Oct 2012 01:26:38 +0000 (18:26 -0700)]
Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches

12 years agoMerge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
Bobby Georgescu [Tue, 2 Oct 2012 01:18:45 +0000 (18:18 -0700)]
Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches

12 years agoImprove display of ActionBar album mode switcher
Bobby Georgescu [Tue, 2 Oct 2012 00:49:30 +0000 (17:49 -0700)]
Improve display of ActionBar album mode switcher

Bug: 7265942
Bug: 7266862
- Ellipsize the title of the album when appropriate
- Show correctly title when swiping from camera to gallery
- Hide the delete icon in the overflow menu to match the
  latest UX mocks, making more room for title

Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940

12 years agoRevert "Enable swiping from LightCycle to Gallery"
George Mount [Tue, 2 Oct 2012 01:15:45 +0000 (18:15 -0700)]
Revert "Enable swiping from LightCycle to Gallery"

This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b
Changed mechanism for enabling swipe in LightCycle.

Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d

12 years agoMerge "Fix exposure and fixed warnings" into gb-ub-photos-arches
John Hoford [Tue, 2 Oct 2012 00:52:41 +0000 (17:52 -0700)]
Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches

12 years agoFix exposure and fixed warnings
John Hoford [Tue, 2 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Fix exposure and fixed warnings

bug:7234321

12 years agoMerge "Fix for exceptions when image has no orientation data." into gb-ub-photos...
Ruben Brunk [Tue, 2 Oct 2012 00:31:17 +0000 (17:31 -0700)]
Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches

12 years agoMerge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
George Mount [Tue, 2 Oct 2012 00:22:23 +0000 (17:22 -0700)]
Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches

12 years agoMove grid/filmstrip switching to ActionBar title "spinner"
Bobby Georgescu [Mon, 1 Oct 2012 22:50:11 +0000 (15:50 -0700)]
Move grid/filmstrip switching to ActionBar title "spinner"

Bug: 7233818
Bug: 7240846
Bug: 7258973

Tapping the title of the album, whether in filmstrip or
grid mode, allows switching between these modes using a
menu. The album name is now displayed when viewing pictures
in the filmstrip or zoomed in modes. Finally, no longer
allow switching to grid mode when not appropriate.

Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0

12 years agoMerge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
John Reck [Mon, 1 Oct 2012 22:34:52 +0000 (15:34 -0700)]
Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches

12 years agoRemove OnFrameAvailableListener in tear down
John Reck [Mon, 1 Oct 2012 22:26:10 +0000 (15:26 -0700)]
Remove OnFrameAvailableListener in tear down

 Bug: 7217305

Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57

12 years agoFix for exceptions when image has no orientation data.
Ruben Brunk [Mon, 1 Oct 2012 22:08:23 +0000 (15:08 -0700)]
Fix for exceptions when image has no orientation data.

Bug: 7219163

When image has no orientation data, getOrientation now
catches the SQLiteException.

Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984

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

12 years agoEnable swiping from LightCycle to Gallery
George Mount [Fri, 28 Sep 2012 19:55:22 +0000 (12:55 -0700)]
Enable swiping from LightCycle to Gallery

 Bug 7212420

Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Oct 2012 18:22:22 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE

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

12 years agoMore logs for gallery crash error, remove a potential cause
Bobby Georgescu [Sun, 30 Sep 2012 21:09:30 +0000 (14:09 -0700)]
More logs for gallery crash error, remove a potential cause

Bug: 7216012
Made sure that FilterDeleteSet doesn't ever return stale
item counts, added extra logging in LocalMergeAlbum for
NoSuchElementException so that we can have more info to
diagnose this crash if it happens in the future.

Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03