OSDN Git Service
The Android Automerger [Thu, 20 Oct 2011 14:01:36 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Owen Lin [Thu, 20 Oct 2011 07:22:40 +0000 (00:22 -0700)]
am
a77f6c46: Fix the issue that cropping wrong region for protrait image.
* commit '
a77f6c46815195c8a2a39c9539163ea3e8683b5d':
Fix the issue that cropping wrong region for protrait image.
Owen Lin [Wed, 19 Oct 2011 11:52:33 +0000 (19:52 +0800)]
Fix the issue that cropping wrong region for protrait image.
Change-Id: Iea7a3874eb7170f8cae943c00cf92669a92b0ae2
fix:
5470203
Ray Chen [Wed, 19 Oct 2011 20:35:20 +0000 (13:35 -0700)]
am
c0ba0936: Fix
5418759 User should be able to view only the preview of that attached
* commit '
c0ba0936bac7d56b92a409380c4d378ed2c272b0':
Fix
5418759 User should be able to view only the preview of that attached
Ray Chen [Wed, 19 Oct 2011 10:30:48 +0000 (18:30 +0800)]
Fix
5418759 User should be able to view only the preview of that attached
Change-Id: Ie3eb2583f7753fc38db3d59aca544a95112010c7
Wei Huang [Wed, 19 Oct 2011 18:01:43 +0000 (11:01 -0700)]
am
6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
* commit '
6172a060689e424ad089594abd5ef1761f6f2ed3':
Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
Wei Huang [Wed, 19 Oct 2011 17:59:15 +0000 (10:59 -0700)]
Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
Chih-Chung Chang [Wed, 19 Oct 2011 17:31:31 +0000 (10:31 -0700)]
am
d82ac818: Merge "Fix
5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0
* commit '
d82ac818b88f0755d0515b282445ac1752976140':
Fix
5424444: Add code to save cropped image for non-local, non-picasa cases.
The Android Automerger [Wed, 19 Oct 2011 14:45:00 +0000 (07:45 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Wed, 19 Oct 2011 10:38:09 +0000 (03:38 -0700)]
Merge "Fix
5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0
Ray Chen [Wed, 19 Oct 2011 10:36:46 +0000 (18:36 +0800)]
resolved conflicts for merge of
71c8cbb7 to master
Change-Id: Ia5dc7bc54bba46218a53959076777e695ebb9dfe
Ray Chen [Wed, 19 Oct 2011 10:09:26 +0000 (03:09 -0700)]
Merge "Fix
5213252 [UI] Updated action bar layouts and action orders" into ics-mr0
Chih-Chung Chang [Wed, 19 Oct 2011 10:08:49 +0000 (03:08 -0700)]
am
bd47a5c6: Fix
5352588: Accept view intent without URI.
* commit '
bd47a5c6bcdcb127adb13c454fec00d4989c50b6':
Fix
5352588: Accept view intent without URI.
Chih-Chung Chang [Wed, 19 Oct 2011 07:35:28 +0000 (15:35 +0800)]
Fix
5424444: Add code to save cropped image for non-local, non-picasa cases.
Change-Id: Ib9f780f71fc9c50fa68a03ebb49f1bd007ca333d
Ray Chen [Wed, 19 Oct 2011 06:37:02 +0000 (14:37 +0800)]
Fix
5213252 [UI] Updated action bar layouts and action orders
Change-Id: I46e993014e578be2e948ecea775522abc2f38a46
Chih-Chung Chang [Tue, 18 Oct 2011 11:54:31 +0000 (19:54 +0800)]
Fix
5352588: Accept view intent without URI.
Change-Id: I719fd853b66c05c4fdbe70ff97993b9487997694
Eric Fischer [Tue, 18 Oct 2011 23:30:46 +0000 (16:30 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 22:41:38 +0000 (15:41 -0700)]
Import revised translations.
Change-Id: I69c2e0260f7f3951bb61c2073744a682696f02a2
Eric Fischer [Tue, 18 Oct 2011 18:36:18 +0000 (11:36 -0700)]
am
c4d49226: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
c4d4922645bbd1fdfed782f452801be52834374f':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:33:00 +0000 (11:33 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:10:59 +0000 (11:10 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I84cd15d12f87d2a1aa7ef5703458e1e8a085358e
Evan Millar [Tue, 18 Oct 2011 17:54:02 +0000 (10:54 -0700)]
am
9905668f: Merge "New widget preview assets" into ics-mr0
* commit '
9905668f4cd39dd9dc8875178afddb6f1f6bfe61':
New widget preview assets
Evan Millar [Tue, 18 Oct 2011 17:51:58 +0000 (10:51 -0700)]
Merge "New widget preview assets" into ics-mr0
Evan Millar [Tue, 18 Oct 2011 17:32:40 +0000 (10:32 -0700)]
New widget preview assets
Bug:
5462438
Change-Id: I84efb185c7eb5647544cacf11f2d70fc6fad3498
Yuli Huang [Tue, 18 Oct 2011 15:13:08 +0000 (08:13 -0700)]
Yuli Huang [Tue, 18 Oct 2011 15:10:08 +0000 (08:10 -0700)]
Merge "Fix b/
5403449." into ics-mr0
Wei Huang [Tue, 18 Oct 2011 13:45:39 +0000 (06:45 -0700)]
am
40ac84e6: Merge "Fix NPE while flipping through pictures." into ics-mr0
* commit '
40ac84e663e89a25540751075db1ff597124de66':
Fix NPE while flipping through pictures.
Chih-Chung Chang [Tue, 18 Oct 2011 13:44:01 +0000 (06:44 -0700)]
am
209a9163: Fix
5393669: New Player Control UI.
* commit '
209a9163d4e8cee0bfe162ae598ef40e6051479c':
Fix
5393669: New Player Control UI.
Wei Huang [Tue, 18 Oct 2011 13:43:02 +0000 (06:43 -0700)]
Merge "Fix NPE while flipping through pictures." into ics-mr0
Owen Lin [Tue, 18 Oct 2011 11:14:07 +0000 (19:14 +0800)]
Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
fix:
5379253
We add a hack to prevent flush out cached data. But the hack will leave
the content window in an invalid values.
Change-Id: I3ed1527b9ee9023b07ca44cafc27510ef9f08d59
Owen Lin [Tue, 18 Oct 2011 08:57:15 +0000 (16:57 +0800)]
Fix NPE while flipping through pictures.
Add a DECODE_FAIL state to Tile's lifecycle.
fix:
5376092
Change-Id: I26ff946d5435f12a6ee84c80f07255cf8327ef32
Yuli Huang [Tue, 18 Oct 2011 04:42:50 +0000 (12:42 +0800)]
Fix b/
5403449.
1. Extract code that recreates/restores ActionBar as RestorableView, and
make both ActionBar and EffectsMenu extend RestorableView.
2. Fix effects-menu buttons too close to each other.
3. Remove effects-menu buttons' highlight animations to look more
responsive.
Change-Id: I68e5bdcde702e611ccced5e169852c0e58a949fc
Chih-Chung Chang [Fri, 14 Oct 2011 08:09:09 +0000 (16:09 +0800)]
Fix
5393669: New Player Control UI.
Change-Id: I1aa310eee3b7715dbefea6b2f24e6f32481db49c
The Android Automerger [Sun, 16 Oct 2011 14:00:39 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Fri, 14 Oct 2011 04:40:53 +0000 (21:40 -0700)]
am
b289d441: Fix
5398768: Add requestCreateBitmapRegionDecoder for InputStream.
* commit '
b289d441eb5af97ac8716479831b1a2c5fe2e878':
Fix
5398768: Add requestCreateBitmapRegionDecoder for InputStream.
Chih-Chung Chang [Fri, 14 Oct 2011 03:22:57 +0000 (11:22 +0800)]
Fix
5398768: Add requestCreateBitmapRegionDecoder for InputStream.
Change-Id: Ied273ffbabc134fdd930e6415fc175a6221eb662
Yuli Huang [Thu, 13 Oct 2011 14:57:17 +0000 (07:57 -0700)]
Yuli Huang [Thu, 13 Oct 2011 06:45:28 +0000 (14:45 +0800)]
Fix UI.
1. Replace slider assets on tablets.
2. Add face-tan effect icon.
3. Change orange color to blue color in straighten effect to be
consistent with crop effect.
Change-Id: I073dea539d68d2a3d7782a520daa911879bc41cd
The Android Automerger [Thu, 13 Oct 2011 14:00:34 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Ray Chen [Thu, 6 Oct 2011 10:03:33 +0000 (18:03 +0800)]
Fix
5417248 Gallery shows Details for the same video no matter which is selected
Change-Id: If221ac3d22adfd3a47d98923dab5c4c1e5ca263d
Chih-Chung Chang [Thu, 13 Oct 2011 04:24:50 +0000 (21:24 -0700)]
am
532d93ca: Fix
5254974: Add EdgeEffect for PhotoView.
* commit '
532d93caddc91a7aa33ca113adbc0b8255d498eb':
Fix
5254974: Add EdgeEffect for PhotoView.
Ray Chen [Thu, 13 Oct 2011 04:23:32 +0000 (21:23 -0700)]
Merge "Fix
5434523 No affordance in Gallery to share a video other than long-press in album view"
Chih-Chung Chang [Wed, 12 Oct 2011 09:10:33 +0000 (17:10 +0800)]
Fix
5254974: Add EdgeEffect for PhotoView.
Change-Id: Ib9ea8fff14a932e8ec25c3f272fe0539776bb062
Ray Chen [Thu, 13 Oct 2011 02:11:48 +0000 (19:11 -0700)]
Merge "Fix
5413911 Gallery app does not recognize that no files are selected for delete"
Yuli Huang [Wed, 12 Oct 2011 15:12:12 +0000 (08:12 -0700)]
The Android Automerger [Wed, 12 Oct 2011 14:01:01 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Yuli Huang [Tue, 11 Oct 2011 13:23:22 +0000 (21:23 +0800)]
Fix b/
5392171 and b/
5389281.
1. Fix b/
5392171 by moving effect context creation into Filter to make
sure it'd be created when needed.
2. Revise the fix for b/
5389281 by clearing surface background even
there's no photo.
Change-Id: I212a552291c7df28b75a909bf6560634ba061e9f
Wei Huang [Tue, 11 Oct 2011 19:59:24 +0000 (12:59 -0700)]
Merge "Fix
5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails"
The Android Automerger [Tue, 11 Oct 2011 12:34:06 +0000 (05:34 -0700)]
merge in ics-release history after reset to master
Yuli Huang [Tue, 11 Oct 2011 08:36:09 +0000 (01:36 -0700)]
Merge "Fix b/
5433856 and b/
5433907."
Ray Chen [Tue, 11 Oct 2011 06:25:20 +0000 (14:25 +0800)]
Fix
5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails
Change-Id: I32722ad2d5f83bb180baceeb887f1cf216eaf692
Ray Chen [Tue, 11 Oct 2011 04:49:45 +0000 (12:49 +0800)]
Fix
5199444 In crop interface, check button and X button should be switched
Fix
5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06.
Fix some other UI issues. (HOME_UP)
Change-Id: Idfa5a258af17b22f13a238cee63a43f3abff776b
Ray Chen [Tue, 11 Oct 2011 03:37:18 +0000 (11:37 +0800)]
Fix
5434523 No affordance in Gallery to share a video other than long-press in album view
Change-Id: I99361fa209ee5ba4200ccb8c1708f649c04519c2
Yuli Huang [Sun, 9 Oct 2011 16:55:26 +0000 (00:55 +0800)]
Fix b/
5433856 and b/
5433907.
1. Make PhotoView restore rotation after the device awakes or
the orientation changes.
2. Avoid outputting top filter until the active effect requests its
output to fix incorrect Crop/Rotate/Doodle effects after device awakes.
3. Speed up rotation speed by removing queued outdated rotation.
Change-Id: I5b82ccfe4e27ad5f1d2505bdd7a7540e0a77b55d
The Android Automerger [Sun, 9 Oct 2011 14:01:06 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Fri, 7 Oct 2011 23:51:17 +0000 (16:51 -0700)]
Import revised translations.
Change-Id: If1ab0cee54999d4e6d6b003643cd9fe743568033
Hung-ying Tyan [Fri, 30 Sep 2011 06:42:50 +0000 (14:42 +0800)]
Request sync when there's no mediaItem in a mediaSet.
This is to fix the problem where media items haven't been sync'ed when the album
set or album is viewed for the first time.
+ Add MediaSet.SyncListener.
+ Make AlbumPage and AlbumSetPage implement SyncListener.
+ Implement requestSync() for ComboAlbum and ComboAlbumSet.
+ add ActivityState.isDestroyed(). This also fixes the problem where
StateManager.finishState() may be called twice.
Bug:
5337899
Change-Id: I25364c3ac25721a2650701c5d7931bfb6daa9303
Ray Chen [Fri, 7 Oct 2011 05:40:35 +0000 (22:40 -0700)]
Merge "Fix
5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component"
Ray Chen [Fri, 7 Oct 2011 05:40:24 +0000 (22:40 -0700)]
Merge "Fix
5343229 Location displayed as co-ordinates in details of picture captured from camera"
Ray Chen [Fri, 7 Oct 2011 04:27:45 +0000 (21:27 -0700)]
Merge "Fix
5250813 Use new standardized no account screen on first launch"
Ray Chen [Wed, 5 Oct 2011 06:32:58 +0000 (14:32 +0800)]
Fix
5413911 Gallery app does not recognize that no files are selected for delete
Change-Id: I90efb3d7676a0810025dd37890c1251725a48223
The Android Automerger [Thu, 6 Oct 2011 14:01:13 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Yuli Huang [Thu, 6 Oct 2011 10:11:50 +0000 (18:11 +0800)]
Replace slider assets and fix save-share-button height.
1. Use the same slider asset for both fill-light and highlights.
2. Update slider assets and dimensions.
3. Fix save-share-button height didn't fill action-bar.
Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
Ray Chen [Thu, 6 Oct 2011 04:00:44 +0000 (12:00 +0800)]
Fix
5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component
Change-Id: I38bdd487d5e406284d86557cfdd8592e598ebdd5
Yuli Huang [Thu, 6 Oct 2011 03:09:02 +0000 (20:09 -0700)]
Merge "Fix b/
5413887 and b/
5389281."
Ray Chen [Wed, 5 Oct 2011 04:31:24 +0000 (12:31 +0800)]
Fix
5343229 Location displayed as co-ordinates in details of picture captured from camera
Change-Id: I223b69a3e10fe85a4622cf33110414cd14624f36
Ray Chen [Tue, 4 Oct 2011 07:19:44 +0000 (15:19 +0800)]
Fix
5250813 Use new standardized no account screen on first launch
This CL also fixes a bug in AlbumSetDataAdapter's ReloadTask, which
causes empty screen after pause/resume.
Change-Id: I7991d40a790384105ccb3021e1e51ba3e5ec8635
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."
The Android Automerger [Wed, 5 Oct 2011 13:59:20 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Tue, 4 Oct 2011 14:00:32 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Mon, 3 Oct 2011 14:00:51 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Fri, 30 Sep 2011 13:45:36 +0000 (06:45 -0700)]
merge in ics-release history after reset to master
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."
The Android Automerger [Thu, 29 Sep 2011 14:00:16 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Owen Lin [Thu, 29 Sep 2011 09:50:56 +0000 (17:50 +0800)]
Rotate the image according to FullImageRotation.
Change-Id: I2c1285aa50b71e0efdbe3c4c50264e42c7b9ab97
fix:
5389974