OSDN Git Service
Yuli Huang [Thu, 6 Oct 2011 03:09:02 +0000 (20:09 -0700)]
Merge "Fix b/
5413887 and b/
5389281."
Claudia de Veaux [Wed, 5 Oct 2011 22:21:02 +0000 (15:21 -0700)]
Edit to Gallery string.
Bug:
5383037
"Delete?" should really just be "Delete".
Change-Id: Ibef97585fe3bae2a2e3062a01a3e9c8b260fe686
Wei Huang [Wed, 5 Oct 2011 18:29:01 +0000 (11:29 -0700)]
Merge "Use merged album as the default parent set for an local media."
Chih-Chung Chang [Wed, 5 Oct 2011 12:46:03 +0000 (05:46 -0700)]
Merge "Fix
5319007: Add fling to PhotoView."
Chih-Chung Chang [Mon, 3 Oct 2011 13:11:39 +0000 (21:11 +0800)]
Fix
5319007: Add fling to PhotoView.
Change-Id: Iacda65fbe1fcb3ad245ad99e0b062606ca6792b9
Owen Lin [Wed, 5 Oct 2011 09:24:16 +0000 (17:24 +0800)]
Use merged album as the default parent set for an local media.
Change-Id: I36062cc1ea06ec9d2eb05e74157f4a071484a8a7
fix:
5141166
Yuli Huang [Wed, 5 Oct 2011 08:22:10 +0000 (16:22 +0800)]
Fix b/
5413887 and b/
5389281.
1. Fix b/
5413887 by releasing MFF effects as well as release
MFF effect-context.
2. Fix b/
5389281 by removing photoView.setPhoto(null).
Change-Id: I1b848f6c87b03ba2539432fd6d6f13f4ac3a2907
Yuli Huang [Wed, 5 Oct 2011 02:56:15 +0000 (19:56 -0700)]
Merge "Fix b/
5032231: Allow share in Photo Editor."
Claudia de Veaux [Tue, 4 Oct 2011 20:06:53 +0000 (13:06 -0700)]
Merge "Gallery string edits to bring to standards. Bugs: 165745,
5163232,
5162668,
5162667,
5162328,
5383037"
Yuli Huang [Tue, 4 Oct 2011 16:01:02 +0000 (00:01 +0800)]
Fix b/
5032231: Allow share in Photo Editor.
Change-Id: I5fd48243df76fd0c2617c92d7f73936172bf6c47
Yuli Huang [Tue, 4 Oct 2011 09:15:37 +0000 (17:15 +0800)]
Fix b/
5375999: replace effect thumbnails.
1. Replace Doodle/Facelift thumbnails.
2. Adjust effect label margins.
3. Remove unused imports from FaceliftFilter.java.
Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc
Chih-Chung Chang [Fri, 30 Sep 2011 10:33:17 +0000 (18:33 +0800)]
Simplify some calculation and add more comments.
Change-Id: I0fcb2e48ba88dc957c5454de09059a265c3dbec1
Claudia de Veaux [Tue, 4 Oct 2011 00:58:40 +0000 (17:58 -0700)]
Gallery string edits to bring to standards.
Bugs: 165745,
5163232,
5162668,
5162667,
5162328,
5383037
Change-Id: Ifa7a9c608bbe59b104a0302555cfef54e00bb311
Evan Millar [Mon, 3 Oct 2011 21:15:38 +0000 (14:15 -0700)]
Remove the "Gallery" title from the AlbumSet page.
bug:
5239335
Change-Id: Iebe624fe8829cf6f905872caa958ebdc76aaa349
Evan Millar [Mon, 3 Oct 2011 20:30:00 +0000 (13:30 -0700)]
Merge "Get rid of "flashies" in the action bar."
Evan Millar [Mon, 3 Oct 2011 20:29:26 +0000 (13:29 -0700)]
Merge "Various UI fixes in Gallery"
Evan Millar [Mon, 3 Oct 2011 18:31:19 +0000 (11:31 -0700)]
Get rid of "flashies" in the action bar.
-Filter out short spinner events. All spinner events that last <1sec are
now ignored. We also enforce a minimum delay time of 2 sec.
-Mark the share and delete menu items as visible="false" by default to
get rid of the quick display/removal of them under scenarios where they
are ultimately removed.
bug:
5398336
Change-Id: I0620532f3ab59d9fde46123620eb781a87445b54
Yuli Huang [Fri, 30 Sep 2011 18:05:06 +0000 (02:05 +0800)]
Fix b/
5317371 to make action-bar consistent with framework CAB.
1. Refactor to decouple ActionBar from FilterStackListener and
ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar.
2. Recreate the action-bar on configuration changes and restore button
status and behaviors from the old action-bar.
3. Use framework CAB styles/dimensions to have consistent look and feel.
Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
Eric Fischer [Fri, 30 Sep 2011 23:55:04 +0000 (16:55 -0700)]
Merge "Import revised translations."
Eric Fischer [Fri, 30 Sep 2011 23:43:36 +0000 (16:43 -0700)]
Import revised translations.
Change-Id: Ia087d1303cf26cb2e7679485c62ac41b24f5ad29
Evan Millar [Fri, 30 Sep 2011 16:57:14 +0000 (09:57 -0700)]
Various UI fixes in Gallery
-New assets for grid and strip selection borders.
-Fix spacing in details dialog.
-New scrollbar asset in the strip view.
-Deleted unused ScrollView.java and GlDetailsView.java
bug:
5327238
Change-Id: I147b8f8069f42e345110f7ae86c47d331551f089
Ruei-sung Lin [Mon, 19 Sep 2011 06:33:17 +0000 (14:33 +0800)]
facelift in gallery
Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
Bor-Yeh Shen [Fri, 30 Sep 2011 10:25:23 +0000 (18:25 +0800)]
Replace effect thumbnails.
Change-Id: I7a8548f23b6e039d59a2e27c7e172fc499a55f91
Chih-Chung Chang [Fri, 30 Sep 2011 04:13:37 +0000 (21:13 -0700)]
Merge "Fix
5336726: sort local albums by reverse chronological order."
Owen Lin [Fri, 30 Sep 2011 03:56:53 +0000 (20:56 -0700)]
Merge "Rotate the image according to FullImageRotation."
Chih-Chung Chang [Thu, 29 Sep 2011 11:07:00 +0000 (19:07 +0800)]
Fix
5336726: sort local albums by reverse chronological order.
Change-Id: I3a04286bea7f43d5f3542b37eddbb4a0801e94f5
The Android Open Source Project [Thu, 29 Sep 2011 21:25:11 +0000 (14:25 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I83684406f2c3ac17cc89b746b27fb5a04333459b
Evan Millar [Thu, 29 Sep 2011 17:27:32 +0000 (10:27 -0700)]
Merge "New spinner assets."
Owen Lin [Thu, 29 Sep 2011 09:50:56 +0000 (17:50 +0800)]
Rotate the image according to FullImageRotation.
Change-Id: I2c1285aa50b71e0efdbe3c4c50264e42c7b9ab97
fix:
5389974
Evan Millar [Tue, 27 Sep 2011 20:38:34 +0000 (13:38 -0700)]
New spinner assets.
bug:
5340690
Change-Id: I0181ce266717ebaf0558e71c0057e2ca0c6f267f
Owen Lin [Tue, 27 Sep 2011 12:14:34 +0000 (20:14 +0800)]
Add maskDebugInfo to display info for debugging build only.
bug:
5335366
Change-Id: I5b6de536bb8e9439b61eb3778fbb1801c8e898c8
Chih-Chung Chang [Thu, 29 Sep 2011 05:34:18 +0000 (13:34 +0800)]
Fix
5388852: Separate CropImage activity to another process to have more memory.
Change-Id: I3bed66e9c61269f94d909508b8a4b3fa6b934976
Chih-Chung Chang [Thu, 29 Sep 2011 05:16:48 +0000 (13:16 +0800)]
Small UI tweak: only show fade-in animation when the bitmap
has not been available for rendering before.
Change-Id: I57df7911c5afa7aa2eec910d0e21679ed978ddad
Michael Jurka [Thu, 29 Sep 2011 03:15:12 +0000 (20:15 -0700)]
Merge "Change gallery crop interface to be consistent with widget resizing"
The Android Automerger [Thu, 29 Sep 2011 00:34:35 +0000 (17:34 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Eric Fischer [Thu, 29 Sep 2011 00:01:07 +0000 (17:01 -0700)]
am
8b577a93: (-s ours) Import revised translations. DO NOT MERGE.
* commit '
8b577a93abeecdc6832c9888e269d5ba66d17b23':
Import revised translations. DO NOT MERGE.
Eric Fischer [Wed, 28 Sep 2011 23:35:02 +0000 (16:35 -0700)]
Import revised translations. DO NOT MERGE.
Change-Id: Idaa85ef45826993b5bc1f4bdf7cd434a3fefb616
Michael Jurka [Tue, 27 Sep 2011 19:21:27 +0000 (12:21 -0700)]
Change gallery crop interface to be consistent with widget resizing
- Always show the resize controls when you're not touching the UI
- Change the resize controls to the holo style
Change-Id: Ia32235d6d82196a24b26fc78b9e9e1e3fb1f5250
Chih-Chung Chang [Wed, 28 Sep 2011 15:07:57 +0000 (08:07 -0700)]
Merge "Fix
5384679: Back button doesn't work in Video Player"
The Android Automerger [Wed, 28 Sep 2011 13:09:58 +0000 (06:09 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Chih-Chung Chang [Wed, 28 Sep 2011 13:07:19 +0000 (21:07 +0800)]
Fix
5384679: Back button doesn't work in Video Player
Change-Id: Idde8778fc5643ef21fd4ad39ffbaa3c9e0c7d147
Chih-Chung Chang [Wed, 28 Sep 2011 11:48:09 +0000 (04:48 -0700)]
Merge "Fix
5158468: Hide system bar when no play control is shown."
Chih-Chung Chang [Tue, 27 Sep 2011 08:50:16 +0000 (16:50 +0800)]
Fix
5158468: Hide system bar when no play control is shown.
Change-Id: Iada70c39440f19eec1cb00088531719bc1bb8328
Chih-Chung Chang [Wed, 28 Sep 2011 07:18:27 +0000 (00:18 -0700)]
Merge "Fix
5367072: Add thumbnail fade-in animation."
Chih-Chung Chang [Tue, 27 Sep 2011 11:44:36 +0000 (19:44 +0800)]
Fix
5367072: Add thumbnail fade-in animation.
Change-Id: I1101721c703d6dcb98f11178d54d65446f74ce06
Ray Chen [Wed, 28 Sep 2011 02:33:05 +0000 (19:33 -0700)]
Merge "Fix
5341761 gallery vibrate on confirm delete"
Eric Fischer [Tue, 27 Sep 2011 21:58:00 +0000 (14:58 -0700)]
am
6fef1583: (-s ours) Import revised translations. DO NOT MERGE
* commit '
6fef1583e0e2a16bc0e45d8166704410b9ecd016':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 27 Sep 2011 21:31:33 +0000 (14:31 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I19bd5d8966bb1d946e1885ac051f5256b4a25148
The Android Automerger [Tue, 27 Sep 2011 20:32:29 +0000 (13:32 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Yuli Huang [Tue, 27 Sep 2011 17:28:02 +0000 (10:28 -0700)]
Yuli Huang [Tue, 27 Sep 2011 17:21:15 +0000 (01:21 +0800)]
Fix b/
5287869 (and b/
5369640).
Images from some app (MMS) may not have columns that PhotoEditor tries
to query, for example: the orientation. Just ignore the absent columns.
Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c
The Android Open Source Project [Tue, 27 Sep 2011 17:11:00 +0000 (10:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic6421d14d0c9fac864e6fe67ae6cd763d50cab9a
Chih-Chung Chang [Tue, 27 Sep 2011 11:36:08 +0000 (04:36 -0700)]
am
d8ad9c0d: Fix
5369640: Only accept content://media URI for photo editor.
* commit '
d8ad9c0d4fbc8bf0bb8bb2849ef537f60f278f8f':
Fix
5369640: Only accept content://media URI for photo editor.
The Android Automerger [Tue, 27 Sep 2011 11:20:17 +0000 (04:20 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ray Chen [Tue, 27 Sep 2011 07:48:08 +0000 (15:48 +0800)]
Fix
5341761 gallery vibrate on confirm delete
Change-Id: I819855f28246c91324ea86ab9e0ac1ec1c19783c
Chih-Chung Chang [Tue, 27 Sep 2011 05:11:51 +0000 (13:11 +0800)]
Fix
5299746: Update panorama thumbnail overlay.
Change-Id: Ide3e592ad5f697acc6b2ebc2a092044803b82d7b
Chih-Chung Chang [Tue, 27 Sep 2011 04:36:41 +0000 (12:36 +0800)]
Fix
5369640: Only accept content://media URI for photo editor.
Change-Id: Ie68e9cfb8ef8d181ac7e23abd4b0caa6ded20938
Chih-Chung Chang [Mon, 26 Sep 2011 09:34:06 +0000 (17:34 +0800)]
Move out PositionController from PhotoView.
Change-Id: Id1088ffbd67ff5e986fdf16f70ba24f1537d10ab
The Android Automerger [Mon, 26 Sep 2011 23:17:28 +0000 (16:17 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Owen Lin [Mon, 26 Sep 2011 20:56:01 +0000 (13:56 -0700)]
am
9025dba3: (-s ours) (DO NOT MERGE)
* commit '
9025dba35881391c24bdaa88d1ec84d15d722f65':
(DO NOT MERGE)
Owen Lin [Tue, 13 Sep 2011 12:48:13 +0000 (20:48 +0800)]
(DO NOT MERGE)
Add a hard limit on the size of the widget images.
There is a limit on the size of the data transfered by binder.
For now, we just add a hard limit (360 pixel) to ensure the widget's image
can be passed by binder.
Also adjust the size of widget to make it looks better.
Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920.
In that case, we should generate a screen nail of size 640x101 instead of
4066x640.
Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9
fix:
5273271
The Android Open Source Project [Mon, 26 Sep 2011 19:11:44 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ica6df20fa29768f8c808da0cc5ec94d2b465a50a
Chih-Chung Chang [Mon, 26 Sep 2011 02:40:38 +0000 (10:40 +0800)]
Fix
5223982: Add animation when scrolling hits the edge.
Change-Id: I3c5191af3fe44ba835ae9b22755613a933065bcd
The Android Automerger [Sun, 25 Sep 2011 13:29:35 +0000 (06:29 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Eric Fischer [Fri, 23 Sep 2011 22:42:24 +0000 (15:42 -0700)]
am
1e62174e: (-s ours) Import revised translations. DO NOT MERGE
* commit '
1e62174ec98efedf58ce2e5a78cd8ba79dfcfde9':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 23 Sep 2011 22:26:03 +0000 (15:26 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib27ab792aba090e740ba6ff15b9d27e53a1c1bc2
Chih-Chung Chang [Fri, 23 Sep 2011 09:04:47 +0000 (02:04 -0700)]
Merge "Fix
5349519: The Select photo/video activity should use action bar."
Owen Lin [Fri, 23 Sep 2011 07:24:28 +0000 (15:24 +0800)]
Fix crop never returns
fix:
5359106
We should return true if the save is successfully.
Also make it more robust even with exceptions.
Change-Id: I4d06b625177d4d479c89a7de1bcdf6f6f301a3da
Chih-Chung Chang [Fri, 23 Sep 2011 05:02:48 +0000 (13:02 +0800)]
Fix
5349519: The Select photo/video activity should use action bar.
Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
Chih-Chung Chang [Fri, 23 Sep 2011 04:48:14 +0000 (21:48 -0700)]
Merge "Fix
5223982: Adding one pixel transparent border around the texture."
Chih-Chung Chang [Thu, 22 Sep 2011 06:55:32 +0000 (14:55 +0800)]
Fix
5223982: Adding one pixel transparent border around the texture.
This avoids the jigged edge around the thumbnails when they are rotated.
Change-Id: Ib2c5a75d1aa69a2f024e003a45111a8af4537f67
The Android Open Source Project [Thu, 22 Sep 2011 17:57:40 +0000 (10:57 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Icf295f55dd7df202e7e6f8b93a5d360abadb0d72
The Android Automerger [Wed, 21 Sep 2011 13:30:00 +0000 (06:30 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 21 Sep 2011 13:19:32 +0000 (06:19 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I445a06a1c4486a76a9278c2ab57415cd902f8927
Chih-Chung Chang [Wed, 21 Sep 2011 09:25:43 +0000 (02:25 -0700)]
Merge "Fix
5229466: Add "up" button to MovieActivity"
Chih-Chung Chang [Wed, 21 Sep 2011 08:31:04 +0000 (01:31 -0700)]
Merge "Fix
5299746: Tweak layout and icons"
Chih-Chung Chang [Wed, 21 Sep 2011 07:38:35 +0000 (15:38 +0800)]
Fix
5229466: Add "up" button to MovieActivity
Change-Id: I5d71bec7a7b09553c12afdd753cd77a73ace2c44
Chih-Chung Chang [Wed, 21 Sep 2011 06:04:34 +0000 (14:04 +0800)]
Fix
5299746: Tweak layout and icons
Change-Id: I36d050fb2459ca559b74be1112b4ac6a8566dc1e
Chih-Chung Chang [Wed, 21 Sep 2011 06:04:30 +0000 (23:04 -0700)]
Merge "Fix
5299746: Update assets."
Yuli Huang [Wed, 21 Sep 2011 05:33:55 +0000 (22:33 -0700)]
Merge "Fix tile-size to sync with the fix in factory branch."
The Android Automerger [Wed, 21 Sep 2011 03:43:06 +0000 (20:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Chih-Chung Chang [Wed, 21 Sep 2011 03:42:07 +0000 (11:42 +0800)]
Fix
5299746: Update assets.
Change-Id: Ia0e2d5206835de51910ca8196ba71ecfb255b72d
Eric Fischer [Tue, 20 Sep 2011 22:38:36 +0000 (15:38 -0700)]
am
aa7fea54: (-s ours) Import revised translations. DO NOT MERGE
* commit '
aa7fea54c7d3d8cf58ff9fa35ffd9dbc3c820f77':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 20 Sep 2011 22:22:12 +0000 (15:22 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I05691313203444b01ae86ba89fb53358d036a1c8
Eric Fischer [Tue, 20 Sep 2011 17:56:45 +0000 (10:56 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 20 Sep 2011 17:30:27 +0000 (10:30 -0700)]
Import revised translations.
Change-Id: Ieb950dd74b2e1f611bf3fcbce3114a8f520ef3dd
Chih-Chung Chang [Tue, 20 Sep 2011 16:23:33 +0000 (09:23 -0700)]
Merge "Fix
5224359: query width and height from media provider."
Yuli Huang [Tue, 20 Sep 2011 15:06:10 +0000 (23:06 +0800)]
Fix tile-size to sync with the fix in factory branch.
Change-Id: I208529a688d44c439dbf0c4d30e4d99e0631fc08
Ruei-sung Lin [Tue, 20 Sep 2011 13:52:37 +0000 (06:52 -0700)]
am
1ede9972: parameter change to match api
* commit '
1ede99728efe8bc622cdafc9d9416bce97d7da50':
parameter change to match api
Chih-Chung Chang [Tue, 20 Sep 2011 12:41:33 +0000 (20:41 +0800)]
Fix
5224359: query width and height from media provider.
Change-Id: Ib7a560822a1d1fdc2be8c572d4d9319f908f7c16
Owen Lin [Tue, 20 Sep 2011 11:33:45 +0000 (04:33 -0700)]
Merge "Lock rendering when switching state."
Ruei-sung Lin [Thu, 15 Sep 2011 07:25:19 +0000 (15:25 +0800)]
parameter change to match api
Cherry-pick to fix b/
5339529.
Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
Owen Lin [Tue, 20 Sep 2011 07:21:20 +0000 (00:21 -0700)]
Merge "Pause the playback of video if the activity is resumed after 3 mins."
Hung-ying Tyan [Tue, 20 Sep 2011 07:14:55 +0000 (00:14 -0700)]
Merge "Make the column type constants public in EntrySchema"
Ray Chen [Tue, 20 Sep 2011 06:04:39 +0000 (23:04 -0700)]
am
3264f438: Fix
5329642 Gallery crashes when viewing Details on certain photos
* commit '
3264f438f6787adcb875b2611b5c20c0b833ec5e':
Fix
5329642 Gallery crashes when viewing Details on certain photos
Chih-Chung Chang [Mon, 19 Sep 2011 03:09:39 +0000 (11:09 +0800)]
Fix
5299746: New UI layout, part 2.
- Replace various icons and add xhdpi/sw600dp-mdpi versions of them.
- When user press on the thumbnails, show a color overlay on it.
- For a wide (w/h > 2) picture, add panorama overlay on it.
- Align photo count label position when there is no icon for it.
- Adjust offline page layout.
Change-Id: I327d25806e99843bfa05d3ca0e9be5a8f9375595
Ray Chen [Mon, 19 Sep 2011 06:20:18 +0000 (14:20 +0800)]
Fix
5329642 Gallery crashes when viewing Details on certain photos
AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown
if the resolving happens really fast. This CL uses 'this' instead of mAdapter.
Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
Owen Lin [Wed, 14 Sep 2011 11:49:03 +0000 (19:49 +0800)]
Pause the playback of video if the activity is resumed after 3 mins.
fix:
5260232
Also keep the current playback position when the activity is resumed.
Originally, we use the bookmark to keep the position. However, the bookmark
will be ignored if
1.) The video duration is less than 2 mins, 2.) The video
is just started (with 30sec), or 3.) The video is approching the end.
I think resume should not limited by the above rules. And we did get some
reports on this. (We mark them as WORK AS INTENTDED).
Change-Id: Ib9ac359d7ccb6a0278777b0892f0821e16bbb745
Owen Lin [Thu, 15 Sep 2011 13:30:16 +0000 (21:30 +0800)]
Lock rendering when switching state.
fix:
5126875
Change-Id: I118660b80cc5dfa8913865e303ed48f23e1c0705
Chih-Chung Chang [Mon, 19 Sep 2011 11:57:35 +0000 (19:57 +0800)]
Fix
5337270: Thumbnail is not generated for large GIF images.
Change-Id: I8e2e8cafb01b2289f59b28b7e2eadae3dc5c0c50