OSDN Git Service
Eric Fischer [Wed, 18 Apr 2012 18:37:24 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1909c28cbf36dd37530f4b2442f87ab9b2964f1
Chih-Chung Chang [Wed, 18 Apr 2012 16:31:59 +0000 (09:31 -0700)]
Chih-Chung Chang [Wed, 18 Apr 2012 16:31:58 +0000 (09:31 -0700)]
Chih-Chung Chang [Wed, 18 Apr 2012 12:08:57 +0000 (20:08 +0800)]
Film strip should be accessible only when an image is its default state.
Change-Id: I4df0db809f6a3f8d28b4e7bbbcddc3fa19d35387
Chih-Chung Chang [Tue, 17 Apr 2012 12:35:14 +0000 (20:35 +0800)]
Add thumb pool the cache Bitmap used for thumbnails.
Change-Id: Ib710f2a6fc1aa86fe4abdd18d1fa7ac71396a3b4
Wu-cheng Li [Wed, 18 Apr 2012 12:09:05 +0000 (05:09 -0700)]
Merge "Add page tap listener."
Wu-cheng Li [Wed, 18 Apr 2012 09:10:02 +0000 (17:10 +0800)]
Add page tap listener.
Camera needs this for touch focus and video snapshot.
bug:
6313318
Change-Id: Ie0b8129160c2a79d4b20fab2173027cddfee7a79
Owen Lin [Wed, 18 Apr 2012 10:22:10 +0000 (03:22 -0700)]
Merge "Slower scrolling for fling in filmstrip mode."
Owen Lin [Tue, 17 Apr 2012 08:21:12 +0000 (16:21 +0800)]
Fix NPE in onContentDirty.
onContentDirty is suppose to be called in Main thread.
Change-Id: Ic6a0fba8abd8a3e17d400bcfc5b82d272b07bc41
Owen Lin [Tue, 17 Apr 2012 07:38:36 +0000 (15:38 +0800)]
Fix NPE in SlotView.
This NPE is actually a concurrent issue. We shall lock renderring when we clean up
the slots' data. But it didn't, so it may access to null data.
Change-Id: I2a8abfbb77f83bd9a240477fa53216ce69b7774d
fix:
6302487
fix:
6308873
Eric Fischer [Tue, 17 Apr 2012 18:29:10 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4ec34a3ec88133e80fe9da1e800ab5c74c89b14
Yuli Huang [Tue, 17 Apr 2012 11:05:52 +0000 (19:05 +0800)]
Fix b/
6318340: window range isn't updated when data size changes.
bug:
6318340
Change-Id: I2098ddc75fe1a4422a20ab90f02a12c9be85c31e
Ray Chen [Mon, 16 Apr 2012 08:18:47 +0000 (16:18 +0800)]
Fix b/
6213053 Add Help entry point to Gallery (targeted for J release)
b:
6213053
Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
Owen Lin [Tue, 17 Apr 2012 07:45:45 +0000 (00:45 -0700)]
Merge "Fix a concurrent issue in reload()."
Chih-Chung Chang [Tue, 17 Apr 2012 04:56:08 +0000 (12:56 +0800)]
Slower scrolling for fling in filmstrip mode.
Also don't animate scale for the first image size.
Change-Id: I6a71c00e813bd203e9f454bc9a776eadec06fd78
Owen Lin [Tue, 17 Apr 2012 04:12:03 +0000 (12:12 +0800)]
Fix a concurrent issue in reload().
We need to hold the DataManager.LOCK when calling reload.
Change-Id: If908c233bcd835effffc7750a7ef07f56a63136c
fix:
6315479
Chih-Chung Chang [Tue, 17 Apr 2012 03:19:54 +0000 (20:19 -0700)]
Chih-Chung Chang [Tue, 17 Apr 2012 03:19:53 +0000 (20:19 -0700)]
Chih-Chung Chang [Tue, 17 Apr 2012 03:19:52 +0000 (20:19 -0700)]
am
51f0fad1: (-s ours) am
da7c5fab: am
42c1892a: Patch 2 for MR1.
* commit '
51f0fad1840800a914cede46ea83447b81e61b8e':
Patch 2 for MR1.
Chih-Chung Chang [Tue, 17 Apr 2012 03:11:37 +0000 (20:11 -0700)]
am
85171a9b: (-s ours) am
0c425fbb: am
4745319b: Patch for MR1.
* commit '
85171a9bc1a1571e3256135893757b0c7a6ab4b7':
Patch for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:55:30 +0000 (15:55 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:55:29 +0000 (15:55 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:54:13 +0000 (15:54 -0700)]
am
da7c5fab: am
42c1892a: Patch 2 for MR1.
* commit '
da7c5fab68cb65d0535d230b9487bfaa5d6ded56':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:54:12 +0000 (15:54 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:08 +0000 (15:52 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:07 +0000 (15:52 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:01 +0000 (15:52 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:00 +0000 (15:52 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:51:55 +0000 (15:51 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:51:54 +0000 (15:51 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 08:29:13 +0000 (16:29 +0800)]
Define max height/width for each picture in filmstrip mode.
Change-Id: I844a32f95237724a60a64afe5f746798886dcc2c
Chih-Chung Chang [Mon, 16 Apr 2012 06:34:46 +0000 (14:34 +0800)]
Reduce padding between photos, from 96 pixels to 16 dp.
Change-Id: I62b0013da45b7d7495b34e9e4e1e791bac9c9c1f
Martijn Coenen [Fri, 13 Apr 2012 22:25:01 +0000 (15:25 -0700)]
Merge "Use new Beam push API."
Martijn Coenen [Fri, 13 Apr 2012 22:23:38 +0000 (15:23 -0700)]
Use new Beam push API.
Change-Id: I3e5a69832d1ac01759e37fbde2cf2c1926219445
Eric Fischer [Fri, 13 Apr 2012 18:04:20 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic4925614c94fbbb2a4d57b5666bf8847aabf2ed6
Owen Lin [Fri, 13 Apr 2012 04:33:29 +0000 (12:33 +0800)]
Fix ANR in PhotoPage.
This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event).
However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the
PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may
still waiting in the queue and never got a chance to run.
Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476
fix:
6319833
Yuli Huang [Thu, 12 Apr 2012 15:45:49 +0000 (23:45 +0800)]
Fix SinglePhotoDataAdapter getScreenNail()
bug:
6322259
Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
Yuli Huang [Tue, 10 Apr 2012 15:36:01 +0000 (08:36 -0700)]
Merge "Save edited photo in the source photo directory if applicable."
Chih-Chung Chang [Tue, 10 Apr 2012 11:51:16 +0000 (04:51 -0700)]
Merge "Add new filmstrip mode for PhotoView."
Chih-Chung Chang [Tue, 3 Apr 2012 04:21:16 +0000 (12:21 +0800)]
Add new filmstrip mode for PhotoView.
Change-Id: I9da9896303ced8d63a3557d5e6e9bc06fb366cf5
Yuli Huang [Tue, 10 Apr 2012 10:51:36 +0000 (18:51 +0800)]
Save edited photo in the source photo directory if applicable.
bug:
6168430
Change-Id: I97d8cf1d286bc4d5d7c38ba5118b9a952f17b252
Owen Lin [Mon, 9 Apr 2012 02:15:35 +0000 (10:15 +0800)]
Add BytesBufferPool to prevent GC.
Change-Id: Ia8513ff380a60f102481cbf25650eca149b75064
Owen Lin [Mon, 9 Apr 2012 08:11:30 +0000 (16:11 +0800)]
Prevent album's label get flashing when content changed.
Change-Id: I1b00b308af740ccab143a073643729ca880770f4
Owen Lin [Fri, 6 Apr 2012 08:46:32 +0000 (16:46 +0800)]
Refactor. Rename AlbumView to AlbumSlotRenderer.
Change-Id: I7d8d3586a910dac35975e4effa0d02528e2ccf98
Owen Lin [Thu, 5 Apr 2012 04:45:54 +0000 (12:45 +0800)]
Draw less to improve performance.
Also adjust the upload order to upload nearby textures first.
Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
Owen Lin [Fri, 6 Apr 2012 08:48:17 +0000 (01:48 -0700)]
Merge "Fix flashing in "Make available offline"."
Eric Fischer [Thu, 5 Apr 2012 19:26:25 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25af65661cea80a20a4dc95da3acc2c8f528e0a1
Owen Lin [Wed, 4 Apr 2012 04:22:59 +0000 (12:22 +0800)]
Fix flashing in "Make available offline".
Change-Id: I84f0896c6038eb21d32e0d5fe0cafec5d339e6ec
Owen Lin [Wed, 4 Apr 2012 02:24:08 +0000 (10:24 +0800)]
Refactor. Merge SelectionDrawer with SlotRenderer.
Change-Id: Iaa50b2a78beb95fc83208a5f74cf612650cd8643
Owen Lin [Thu, 29 Mar 2012 06:27:58 +0000 (14:27 +0800)]
Upload textures in background.
Change-Id: I365f7be9aaab793366884249cbb10e8b6f0ab0e6
Owen Lin [Thu, 5 Apr 2012 07:11:05 +0000 (00:11 -0700)]
Merge "Make all drawing happens in background."
Owen Lin [Mon, 26 Mar 2012 10:28:48 +0000 (18:28 +0800)]
Make all drawing happens in background.
Also move more rendering code to SlotRenderers (AlbumSetView and AlbumView).
Change-Id: I1d678711bfd3655a48bb4b99d8ca175e088bdffb
Owen Lin [Thu, 5 Apr 2012 04:02:01 +0000 (12:02 +0800)]
Fix NPE in Gallery.
bug:
6249248
Change-Id: I41851c6524163195f6296a15893d962e706b3449
Martijn Coenen [Tue, 27 Mar 2012 01:25:50 +0000 (18:25 -0700)]
Support for beaming a picture.
Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
Mike Lockwood [Tue, 3 Apr 2012 17:52:23 +0000 (10:52 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
Wu-cheng Li [Tue, 3 Apr 2012 11:08:35 +0000 (19:08 +0800)]
Fix OOM when switching between camera and camcorder.
- Camera activities extend AbstractGalleryActivity. So
onDestroy is moved from Gallery to AbstractGalleryActivity.
- Use WeakReference for values in the WeakHashMap of
SpinnerVisibilitySetter.
bug:
5954389
Change-Id: Ib15f269bd4c54a4621bdff58e7ea16b44f8fb3e3
Ray Chen [Tue, 3 Apr 2012 02:42:55 +0000 (10:42 +0800)]
Fix b/
3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up
Change startActivity to switchState because not every MediaObject implements "getContentUri" which may
cause runtime exception.
Change-Id: I88be6e9e8f15ad17f4c7347b6dfc200c7682ce01
Ray Chen [Tue, 3 Apr 2012 09:24:21 +0000 (02:24 -0700)]
Merge "Fix b/
6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps"
Yuli Huang [Tue, 3 Apr 2012 09:02:29 +0000 (02:02 -0700)]
Merge "Fix b/
5974240: Sliders may not be responsive to touches."
Yuli Huang [Mon, 2 Apr 2012 13:40:25 +0000 (21:40 +0800)]
Fix b/
5974240: Sliders may not be responsive to touches.
Add padding around sliders to increase its touchable areas.
Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
Chih-Chung Chang [Mon, 2 Apr 2012 09:31:55 +0000 (17:31 +0800)]
Remove FilmStripView.
Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
Owen Lin [Mon, 2 Apr 2012 10:38:02 +0000 (03:38 -0700)]
Merge "Delete buffers and textures in GL."
Owen Lin [Mon, 2 Apr 2012 10:12:32 +0000 (18:12 +0800)]
Delete buffers and textures in GL.
Change-Id: I7cd6647c7da56040c040f43859ce8e440db7b498
Owen Lin [Fri, 23 Mar 2012 06:59:14 +0000 (14:59 +0800)]
Remove Position and PositionRepository.
Also fix a regression introduced in previous change.
Change-Id: I534c8ca7838f3518856cf48878dd49beeb331562
Ray Chen [Mon, 2 Apr 2012 04:07:58 +0000 (12:07 +0800)]
Fix b/
6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
This CL removes the cancel options, the next one will address the undo feature.
Change-Id: I99bb24fee0add0ffe6b4fcc9d32528abdd0ed418
Chih-Chung Chang [Thu, 22 Mar 2012 09:42:33 +0000 (17:42 +0800)]
Use SurfaceTexture to show Camera preview.
Change-Id: I8bf63dfc5b969ecce51841378b093a650b6f91d8
Ray Chen [Thu, 29 Mar 2012 08:37:23 +0000 (01:37 -0700)]
Merge "Move getTypeString from PicasaAlbumSet to MediaObject."
Ray Chen [Fri, 23 Mar 2012 14:10:21 +0000 (22:10 +0800)]
Move getTypeString from PicasaAlbumSet to MediaObject.
b/
5344124
Change-Id: I28a43615ebec0aa84c3b16ac006def26f7b56162
Chih-Chung Chang [Thu, 29 Mar 2012 02:39:16 +0000 (19:39 -0700)]
Merge "Patch 2 for master."
Owen Lin [Wed, 28 Mar 2012 07:31:07 +0000 (00:31 -0700)]
Merge "Refactor. Make the code simpler."
Yuli Huang [Tue, 27 Mar 2012 04:10:27 +0000 (12:10 +0800)]
Fix b/
6212093: Title wasn't updated for orientation changes.
Change-Id: I407cfb8f2bde5bab302045188f4f511bdcd2347a
b:
6212093
Chih-Chung Chang [Wed, 21 Mar 2012 11:01:30 +0000 (19:01 +0800)]
Patch 2 for master.
Change-Id: I8b7c9fd326c4f247a1f2129b1d64388a223d79e0
Owen Lin [Thu, 22 Mar 2012 06:14:40 +0000 (14:14 +0800)]
Refactor. Make the code simpler.
Change-Id: I2d3b7a1cfed17afcf6b7ee3e7bf1ca13ada8d9c3
Eric Fischer [Fri, 23 Mar 2012 18:08:39 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie08a098ada3db0dd6b6791a117997c6c5cb043e9
Chih-Chung Chang [Thu, 22 Mar 2012 11:17:36 +0000 (04:17 -0700)]
Merge "New effect in photo browsing."
Chih-Chung Chang [Wed, 21 Mar 2012 11:01:30 +0000 (19:01 +0800)]
Patch 2 for MR1.
Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
Hung-ying Tyan [Thu, 22 Mar 2012 04:00:46 +0000 (21:00 -0700)]
Merge "Make PackagesMonitor go async"
Hung-ying Tyan [Wed, 21 Mar 2012 07:08:16 +0000 (15:08 +0800)]
Make PackagesMonitor go async
to offload package event processing from main thread.
Bug:
6109890
Change-Id: I77e1fad9a4ac24020eed68d53ca7e1d253248890
Chih-Chung Chang [Wed, 21 Mar 2012 08:19:21 +0000 (16:19 +0800)]
New effect in photo browsing.
Change-Id: I12ca70f56f5c874292a7a6f38f0518bbc855ed70
Wu-cheng Li [Thu, 22 Mar 2012 03:37:59 +0000 (20:37 -0700)]
Merge "Remove singleTask mode of panorama."
Owen Lin [Thu, 22 Mar 2012 01:23:38 +0000 (18:23 -0700)]
Merge changes I1acef9fc,I53ddb3cd
* changes:
Make top level albums can be loaded concurrently.
Add log to debug loading time.
Yuli Huang [Tue, 20 Mar 2012 08:37:05 +0000 (16:37 +0800)]
Fix incorrect initial position/scale of opening animations.
1. Initial position of opening animation isn't correctly offset if the
position repository isn't properly offset by the action bar height.
2. Initial scale of opening animation should match the thumbnail instead
of using a fixed value 240.
This CL is part of efforts to fix b:
6016973.
Change-Id: I620705357ba7594d43685e47488928f9fc93d9f6
Chih-Chung Chang [Thu, 15 Mar 2012 08:38:45 +0000 (16:38 +0800)]
Create a ScreenNail interface so we can add other types of screenails.
Add a new MediaItem type to contain a ScreenNail.
Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
Chih-Chung Chang [Tue, 20 Mar 2012 12:56:49 +0000 (20:56 +0800)]
Patch for MR1.
Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
Owen Lin [Fri, 16 Mar 2012 05:51:49 +0000 (13:51 +0800)]
Make top level albums can be loaded concurrently.
Change-Id: I1acef9fc9a442c36ad1d9d0931b0defc6091bf33
fix:
5947962
Owen Lin [Tue, 13 Mar 2012 06:17:01 +0000 (14:17 +0800)]
Add log to debug loading time.
Change-Id: I53ddb3cdce7abe9de7c5bbd85c1adad474bdff2f
Ray Chen [Tue, 20 Mar 2012 08:32:57 +0000 (16:32 +0800)]
Fix b/
6191707 Unable to set Custom wallpaper from Home
Change-Id: I130f74c94ebf5d93922807f7fee5ae7f189a15d4
Wu-cheng Li [Mon, 19 Mar 2012 07:42:27 +0000 (15:42 +0800)]
Remove singleTask mode of panorama.
Camera, VideoCamera, PanoramaActivity will be combined to
reduce the latency. singleTask should be removed to
achieve that.
bug:
5954389
Change-Id: Ic79f59baffd24669910d1f05b65865788803b79c
Ray Chen [Fri, 16 Mar 2012 06:38:04 +0000 (14:38 +0800)]
Revert "bug #
6176711: guard against null GalleryActionBar." and
fix DialogPicker's NPE issue while setting wallpaper.
Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00
Owen Lin [Fri, 16 Mar 2012 07:21:41 +0000 (00:21 -0700)]
Merge "Fix a regression, we forget assigne a value to a member variable."
Owen Lin [Fri, 16 Mar 2012 06:51:47 +0000 (14:51 +0800)]
Fix a regression, we forget assigne a value to a member variable.
Change-Id: I07b6654ddf73f4c92a75d81a3ec8f1075526f5fd
Wei Huang [Thu, 15 Mar 2012 22:30:15 +0000 (15:30 -0700)]
Merge "bug #
6176711: guard against null GalleryActionBar."
Wei Huang [Thu, 15 Mar 2012 22:23:00 +0000 (15:23 -0700)]
bug #
6176711: guard against null GalleryActionBar.
When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object.
I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken.
Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340
Eric Fischer [Thu, 15 Mar 2012 18:44:41 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49d04d1c50230fbd0af5046d7df4a2a86a3b4b05
Pin Ting [Thu, 15 Mar 2012 07:49:51 +0000 (00:49 -0700)]
Merge "Change panorama java package name."
Pin Ting [Thu, 15 Mar 2012 06:46:53 +0000 (14:46 +0800)]
Change panorama java package name.
bug:
5954391
Make camera, camcorder, panorama activities share the same java package.
Change-Id: I5b72e94d5fa335a4089e3700e4cc3b5af3f882f6
Ray Chen [Wed, 7 Mar 2012 10:22:17 +0000 (18:22 +0800)]
Fix
6039387 Wrong app icon shown when playing 'personal video' from Videos app
Change-Id: Idf5af5172d5d413e64712331e3e6331f13e1b95c
Ray Chen [Tue, 6 Mar 2012 09:24:28 +0000 (17:24 +0800)]
Fix
3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up.
Some changes in this CL:
1. ActivityState can decide whether to enable home button and show up arrow
2. ActivityState can handle home_up event on its own
3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll)
4. Gallery supports view action for AlbumPage (Camera Roll)
Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c
Ray Chen [Thu, 15 Mar 2012 00:47:31 +0000 (17:47 -0700)]
Merge "Fix
5406844 Category switcher does not highlight current selection"
Chih-Chung Chang [Wed, 14 Mar 2012 09:39:42 +0000 (17:39 +0800)]
Aggregate three gesture detectors.
Change-Id: I270cd7bdeb81d9a8ea5d3aa122f44074413e7616