OSDN Git Service
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 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."
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
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
Owen Lin [Wed, 14 Mar 2012 09:27:24 +0000 (17:27 +0800)]
Reorganize import for all files.
Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
Owen Lin [Wed, 14 Mar 2012 08:23:09 +0000 (01:23 -0700)]
Merge "Reuse bitmap for all micro thumb images to prevent GC."
Owen Lin [Wed, 7 Mar 2012 09:39:56 +0000 (17:39 +0800)]
Reuse bitmap for all micro thumb images to prevent GC.
Change-Id: I27d3002e5bb745a597f52962fe24744c8329441c
Yuli Huang [Mon, 12 Mar 2012 08:34:41 +0000 (16:34 +0800)]
Simplify PhotoEditor code.
1. Encapsulate spinner usages inside Toolbar.
2. Remove unnecessary static variable usages.
Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
Chih-Chung Chang [Tue, 13 Mar 2012 05:31:44 +0000 (22:31 -0700)]
Merge "Set task affinity for Camera activities."
Chih-Chung Chang [Tue, 13 Mar 2012 04:28:02 +0000 (12:28 +0800)]
Set task affinity for Camera activities.
Bug:
6156475
Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be
Eric Fischer [Mon, 12 Mar 2012 18:51:15 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibd6567a362824e6ca459de53191c32c31813aa9d
Ray Chen [Mon, 12 Mar 2012 13:34:25 +0000 (21:34 +0800)]
Fix
5406844 Category switcher does not highlight current selection
Change-Id: I7f6295d452764220bd3faa49526be25872a42e6d
Chih-Chung Chang [Mon, 12 Mar 2012 08:04:59 +0000 (16:04 +0800)]
Add DisableCameraReceiver to disable camera activities if there is no camera.
Change-Id: I84061e05c5eec793bf528df1c43d931d22d91d35
Chih-Chung Chang [Mon, 12 Mar 2012 04:46:25 +0000 (12:46 +0800)]
Change id "root" to "movie_view_root" to avoid confusion.
There is also one id "root" in Camera.
Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
Chih-Chung Chang [Fri, 9 Mar 2012 09:21:20 +0000 (01:21 -0800)]
Merge "Merge Camera into Gallery package."
Chih-Chung Chang [Thu, 8 Mar 2012 12:10:53 +0000 (20:10 +0800)]
Merge Camera into Gallery package.
Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
Yuli Huang [Thu, 8 Mar 2012 11:11:54 +0000 (19:11 +0800)]
Fix b/
5948180: Photo is repositioned during being scaled.
Avoid repositioning photo to center vertically during scaling it.
Change-Id: Id9f2de6b2b1611419a0c03888cff49a5336b39df
Yuli Huang [Thu, 8 Mar 2012 04:03:51 +0000 (20:03 -0800)]
Merge "Fix b/
5948187: Add progress text for loading video."
Eric Fischer [Wed, 7 Mar 2012 19:12:06 +0000 (11:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I675ae2b5e04df6941251c8f561033fefffca3c93
Yuli Huang [Wed, 7 Mar 2012 11:35:28 +0000 (19:35 +0800)]
Fix b/
5948187: Add progress text for loading video.
Change-Id: If85a5db3c6128cf0c59b97dc44f51cdfc87d225b
Yuli Huang [Tue, 6 Mar 2012 17:18:08 +0000 (01:18 +0800)]
Fix b/
5885342: Multiple PhotoEditor activities cause exceptions.
Avoid using a static variable to keep tracking views across activities.
Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
Chih-Chung Chang [Fri, 2 Mar 2012 10:14:53 +0000 (18:14 +0800)]
Use AnimationTime for animation caluclation.
Change-Id: I3af8334978c054ddbc2050a240f0d9c113a44012
Yuli Huang [Thu, 1 Mar 2012 09:39:47 +0000 (17:39 +0800)]
Fix a wrong flag value.
Change-Id: I7450dc31bb307b19dcfd34ee7df83126df1d294e
Yuli Huang [Thu, 1 Mar 2012 08:51:08 +0000 (16:51 +0800)]
Fix b/
6064909: Photo might not be snapped back correctly.
Photo might not be snapped back if the animation wasn't actually started
because of no position/scale changes.
Change-Id: I6b5e938bffd954b848cae04514a06d0427151025
Yuli Huang [Thu, 23 Feb 2012 14:26:12 +0000 (22:26 +0800)]
Fix b/
5624131: Panning enlarged photo switches images by mistake.
Avoid swiping images when panning to view vertically enlarged photo.
Change-Id: Ieb72cb8f38595fbedc927e8a0380fe31532ee434
Ray Chen [Wed, 29 Feb 2012 07:29:01 +0000 (23:29 -0800)]
Merge "Fix
5948189 BUG BASH: action bar flashes during multi-select"
Ray Chen [Mon, 20 Feb 2012 05:32:47 +0000 (13:32 +0800)]
Fix
5948189 BUG BASH: action bar flashes during multi-select
This CL fixes the flashing by disabling MenuItem directly instead of setting null intent
to ShareActionProvider, so there won't be any "icons shrinking" effect that causes flashing.
The rest of the change is code refactoring. More comments are added and the final UI operations
are merged into one Runnable object.
Change-Id: I73843c1df6b7a9675176e1b3ae6a35cc1cb715fa
Eric Fischer [Tue, 28 Feb 2012 19:11:26 +0000 (11:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: If2542a34f7e9e4b999252e8cf98cd2a5a8b9f3d9
Eric Fischer [Mon, 27 Feb 2012 20:21:35 +0000 (12:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idf31034a533999342bf2452f2e66b6cc0ae4dd7c
Ray Chen [Fri, 17 Feb 2012 05:12:32 +0000 (13:12 +0800)]
Fix
5948223 [bug bash] Albums text disappears when exiting gallery
Change-Id: Ib787184f747ff30afabc35b16b46950dc3b5b50c
Ray Chen [Fri, 17 Feb 2012 04:40:44 +0000 (12:40 +0800)]
Fix
5948410 BUG BASH: Temporarily title is displayed during gallery start
Change-Id: I88a67e3e9437124001be836239736a8275c1abf4
Chih-Chung Chang [Wed, 22 Feb 2012 00:00:31 +0000 (08:00 +0800)]
Remove unused code.
Change-Id: I167596ab023671651df298ddb2b80b7c782f4223
Chih-Chung Chang [Fri, 17 Feb 2012 22:17:18 +0000 (06:17 +0800)]
Reduce memory allocation and make small improvements.
Change-Id: Iac3f302454119de6363cd5cfb158619e739b0536
Chih-Chung Chang [Fri, 17 Feb 2012 02:02:27 +0000 (10:02 +0800)]
Cache animation time value to reduce work and synchronize animation.
Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
Chih-Chung Chang [Thu, 16 Feb 2012 20:47:14 +0000 (12:47 -0800)]
Merge "Change from fillRect to clearBuffer for pure black background."
The Android Open Source Project [Thu, 16 Feb 2012 19:25:39 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:23 +0000 (11:25 -0800)]
Chih-Chung Chang [Thu, 16 Feb 2012 18:25:23 +0000 (02:25 +0800)]
Change from fillRect to clearBuffer for pure black background.
Change-Id: Ie3da19b377f3e7926ab37c5936ce48cbb3227f92
The Android Open Source Project [Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)]
am
aa5bdb1a: Reconcile with ics-mr1-release
* commit '
aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:54 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I5fc102975a6f3ef9fe1fa8c73260b9571dce0e1a
The Android Open Source Project [Thu, 16 Feb 2012 18:06:44 +0000 (10:06 -0800)]
am
5e73e2dc: Reconcile with ics-mr1-release
* commit '
5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b
Chih-Chung Chang [Thu, 16 Feb 2012 18:02:12 +0000 (02:02 +0800)]
Simplify the reference from textures to GLCanvas.
Change-Id: Ia64e60ec4b920b707148f7c2b9373ce484a52d9f
Chih-Chung Chang [Wed, 15 Feb 2012 23:27:03 +0000 (07:27 +0800)]
Make GLCanvas a bit faster.
(1) make a faster version of translate(x, y).
(2) make mapPoints() faster.
(3) avoid calling canvas.rotate() when it is not needed.
Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482
Chih-Chung Chang [Wed, 15 Feb 2012 20:36:29 +0000 (12:36 -0800)]
Merge "Try to use less of "Long" to make the program faster."
Chih-Chung Chang [Wed, 15 Feb 2012 00:19:50 +0000 (08:19 +0800)]
Try to use less of "Long" to make the program faster.
Change-Id: I6adb870a8f2bca97318d0fbb6f42388aef4c19c1
The Android Automerger [Tue, 14 Feb 2012 22:16:37 +0000 (14:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 14 Feb 2012 21:18:04 +0000 (13:18 -0800)]
Import translations.
Change-Id: I958b1d3318cbf5a8840ba8053ac748f1d96a7eff
Chih-Chung Chang [Tue, 14 Feb 2012 17:30:35 +0000 (09:30 -0800)]
am
eeda756e: Merge "Add profiling tools."
* commit '
eeda756e6efb58710916d614a4c79437df25e380':
Add profiling tools.
Chih-Chung Chang [Tue, 14 Feb 2012 17:28:17 +0000 (09:28 -0800)]
Merge "Add profiling tools."
Yuli Huang [Tue, 14 Feb 2012 03:28:24 +0000 (19:28 -0800)]
am
a431626b: Merge "Fix b/
5948042: Incorrect scrolling position after deleting pictures."
* commit '
a431626bba8c6441fe0ee007e9d950b47f06ad96':
Fix b/
5948042: Incorrect scrolling position after deleting pictures.
Yuli Huang [Tue, 14 Feb 2012 03:26:38 +0000 (19:26 -0800)]
Merge "Fix b/
5948042: Incorrect scrolling position after deleting pictures."
Chih-Chung Chang [Fri, 3 Feb 2012 13:17:17 +0000 (21:17 +0800)]
Add profiling tools.
Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e