OSDN Git Service
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
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
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
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
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: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
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
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 [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 [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
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 18:25:23 +0000 (02:25 +0800)]
Change from fillRect to clearBuffer for pure black background.
Change-Id: Ie3da19b377f3e7926ab37c5936ce48cbb3227f92
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 00:19:50 +0000 (08:19 +0800)]
Try to use less of "Long" to make the program faster.
Change-Id: I6adb870a8f2bca97318d0fbb6f42388aef4c19c1
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: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
Chih-Chung Chang [Mon, 13 Feb 2012 18:22:25 +0000 (10:22 -0800)]
Merge "Use FloatMath instead of Math."
Yuli Huang [Mon, 13 Feb 2012 11:55:58 +0000 (19:55 +0800)]
Fix b/
5948042: Incorrect scrolling position after deleting pictures.
Scrolling position may not be updated correctly after deleting some
pictures.
Change-Id: I82de2cf1178ed1f97e48162a0e3bdf00a34d9bad
Pin Ting [Sat, 11 Feb 2012 07:19:29 +0000 (23:19 -0800)]
Merge "Shows video filename read from OpenableColumns."
Chih-Chung Chang [Fri, 10 Feb 2012 23:19:47 +0000 (07:19 +0800)]
Use FloatMath instead of Math.
Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da
Chih-Chung Chang [Sat, 11 Feb 2012 01:09:31 +0000 (17:09 -0800)]
Merge "Revert "Use FloatMath instead of Math.""
Chih-Chung Chang [Sat, 11 Feb 2012 01:08:58 +0000 (17:08 -0800)]
Revert "Use FloatMath instead of Math."
This reverts commit
6bb8b2eb8695c042798f0eb798032cd30d642a65
Chih-Chung Chang [Sat, 11 Feb 2012 00:10:20 +0000 (16:10 -0800)]
Merge "Use FloatMath instead of Math."
Chih-Chung Chang [Fri, 10 Feb 2012 23:19:47 +0000 (07:19 +0800)]
Use FloatMath instead of Math.
Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b
Pin Ting [Fri, 10 Feb 2012 18:53:53 +0000 (02:53 +0800)]
Shows video filename read from OpenableColumns.
bug:
5796182
Change-Id: I92bc652d713bcc70b5a048f5948dc17e90a5e874
Yuli Huang [Fri, 10 Feb 2012 07:36:29 +0000 (23:36 -0800)]
Merge "Fix b/
5974541: Support up to 45 degrees for straighten."
Ray Chen [Thu, 9 Feb 2012 14:47:12 +0000 (06:47 -0800)]
Merge "Fix indent."
Yuli Huang [Thu, 9 Feb 2012 10:39:31 +0000 (18:39 +0800)]
Fix b/
5974541: Support up to 45 degrees for straighten.
Change-Id: I131a478c59f5619e801311d9872440b2c7014578
Yuli Huang [Thu, 9 Feb 2012 07:57:11 +0000 (23:57 -0800)]
Merge "Fix b/
5974663: inconsistent transparency of disabled action buttons."
Pin Ting [Thu, 9 Feb 2012 07:55:48 +0000 (23:55 -0800)]
Merge "Shows image filename read from OpenableColumns."
Yuli Huang [Thu, 9 Feb 2012 07:21:40 +0000 (15:21 +0800)]
Fix b/
5974663: inconsistent transparency of disabled action buttons.
1. Avoid gray out save-button again as disabled alpha is already applied
to all text buttons.
2. Reduce disabled alpha of image buttons to make them look consistent
with text buttons.
Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
Pin Ting [Tue, 7 Feb 2012 10:11:25 +0000 (18:11 +0800)]
Shows image filename read from OpenableColumns.
bug:
5796182
Change-Id: If43d2dd048ab003c1703bb1a466a19b6013cae85
Ray Chen [Tue, 7 Feb 2012 12:23:44 +0000 (20:23 +0800)]
Fix indent.
Change-Id: I3e0c443ddfb2ebc777db7504c89ca1ffec119745
Yuli Huang [Tue, 7 Feb 2012 07:51:24 +0000 (15:51 +0800)]
Fix b/
5840847: Always show 'Loading...' for corrupt pictures.
Change-Id: I040f6e4090dad3e73b86062ddefd9bb0be581bf5
Pin Ting [Mon, 6 Feb 2012 06:24:13 +0000 (22:24 -0800)]
Merge "Shows status bar in gallery when in portrait view."
Pin Ting [Fri, 3 Feb 2012 10:35:00 +0000 (18:35 +0800)]
Shows status bar in gallery when in portrait view.
bug:
5467810
Shows status bar in gallery, crop activity, picker activity when in
portrait view; hide status bar when in landscape view.
Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
Ray Chen [Fri, 3 Feb 2012 03:25:24 +0000 (11:25 +0800)]
Fix
5948229 [Bug Bash] The app icon is clickable in album set view
Change-Id: I563d2322fe5f1954ffaab7424b66d22722ed43a7
Pin Ting [Thu, 2 Feb 2012 06:59:10 +0000 (22:59 -0800)]
Merge "Shows video filename passed from other apps."
Pin Ting [Thu, 2 Feb 2012 06:58:57 +0000 (22:58 -0800)]
Merge "Shows image filename passed from other apps."
Pin Ting [Wed, 18 Jan 2012 10:15:27 +0000 (18:15 +0800)]
Shows video filename passed from other apps.
bug:
5796182
Change-Id: I8de80b56105737ac38db117804b55a161150dbe9
Pin Ting [Wed, 18 Jan 2012 09:19:42 +0000 (17:19 +0800)]
Shows image filename passed from other apps.
bug:
5796182
This change will be followed up by a change to the class
android.content.Intent.
Change-Id: I3c607c535a4e90d867a98528118d1b6f10fa45cf
Chih-Chung Chang [Wed, 1 Feb 2012 10:40:57 +0000 (18:40 +0800)]
Localize the "fail to load image" toast message.
Bug
5875813.
Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
The Android Open Source Project [Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)]
am
7e11af8f: Reconcile with ics-mr1-release
* commit '
7e11af8f5813972dd64032e70068e10f87771234':
The Android Open Source Project [Thu, 19 Jan 2012 21:07:12 +0000 (13:07 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id6ecd416cb70e55c28ff885caae29d9000dc9133
Chih-Chung Chang [Tue, 17 Jan 2012 21:09:52 +0000 (13:09 -0800)]
Chih-Chung Chang [Tue, 17 Jan 2012 19:45:24 +0000 (11:45 -0800)]
Pin Ting [Fri, 13 Jan 2012 09:48:10 +0000 (17:48 +0800)]
Fixes gallery crash due to attempt to open deleted photo.
bug:
5630894
Change-Id: I540bf067561550def72ac513eed12dcd5a808a1a
The Android Automerger [Sat, 14 Jan 2012 00:18:42 +0000 (16:18 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Thu, 5 Jan 2012 04:00:53 +0000 (12:00 +0800)]
Patch.
Change-Id: I62fd65461e8989a1d5cf6bc353dfc4b61a2108c8
Chih-Chung Chang [Mon, 9 Jan 2012 04:41:57 +0000 (12:41 +0800)]
Fix
5835642: Only finish the page when it's still active.
The original code can call finishState twice in a row with the calling
stack: finishState -> onPause -> clearLoadingBit -> finishState.
Change clearLoadingBit to call finishState only when it's currently active.
Change-Id: I537dbdd6ce26b26aeb565e243c4168229d4a70ef
Owen Lin [Wed, 14 Dec 2011 04:30:39 +0000 (12:30 +0800)]
Support querying account and picasa id of a picasa image.
Change-Id: I7d24fb70b0a8a01c5d0fbdb6205c25d74d1996a6
fix:
5482269
Yuli Huang [Mon, 5 Dec 2011 13:00:58 +0000 (21:00 +0800)]
Improve Doodle UI for ending Doodle effect.
As doodle-view was removed before the final doodle results are
produced by MFF and displayed, doodles drawn disappeared temporarily
when the user exits Doodle effect.
Change-Id: I72822ba840f41f509fe4e9a2e1022a5b40b14e6a
Yuli Huang [Fri, 2 Dec 2011 19:23:52 +0000 (03:23 +0800)]
Fix effect-label layout and a TODO.
1. Seekbar was wrongly placed below effect label because of the added
order.
2. Fix a TODO by refactoring EffectToolFactory to EffectToolKit.
Change-Id: I8d37c2c2b6d15f2af65d4e6b27116afe01df63c9
Yuli Huang [Fri, 2 Dec 2011 17:08:12 +0000 (09:08 -0800)]
Merge "Simplify EffectAction."
Yuli Huang [Fri, 2 Dec 2011 11:55:05 +0000 (19:55 +0800)]
Simplify EffectAction.
1. Make the whole effect item clickable instead of just the icon.
2. Rename interfaces/methods to improve readability.
Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
The Android Open Source Project [Fri, 2 Dec 2011 15:53:37 +0000 (07:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaaf97ddd8d3786e661679d822ccdb7241303db51
Yuli Huang [Fri, 2 Dec 2011 09:35:34 +0000 (17:35 +0800)]
Remove unnecessary code.
Revert BitmapUtils changes made in cl:122870 as crop/rotate is now done
in MFF.
Change-Id: I3733c9acf911c4f694dd21dd533b0dd07350acea
Yuli Huang [Fri, 2 Dec 2011 08:09:00 +0000 (00:09 -0800)]
Merge "Refactor to remove obsolete design and improve code consistency."
The Android Automerger [Fri, 2 Dec 2011 00:46:14 +0000 (16:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 20:41:58 +0000 (12:41 -0800)]
am
a8e684f5: (-s ours) Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
* commit '
a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3':
Remove dependency on support library. DO NOT MERGE.