OSDN Git Service
Chih-Chung Chang [Fri, 30 Sep 2011 12:46:35 +0000 (05:46 -0700)]
am
99b1e2bd: Merge "Fix
5336726: sort local albums by reverse chronological order."
* commit '
99b1e2bde5a31a729cb4cd536e7064443caef2d8':
Fix
5336726: sort local albums by reverse chronological order.
Owen Lin [Fri, 30 Sep 2011 12:46:32 +0000 (05:46 -0700)]
am
c046bbaa: Merge "Rotate the image according to FullImageRotation."
* commit '
c046bbaa7062a941b8fc462f6dcaabda926fa05a':
Rotate the image according to FullImageRotation.
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:26:56 +0000 (14:26 -0700)]
am
bfc7422b: Reconcile with ics-factoryrom-release
* commit '
bfc7422b6b40edc7a0917db18adf02b972c22060':
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:29:02 +0000 (10:29 -0700)]
am
731d46ed: Merge "New spinner assets."
* commit '
731d46ed4c57df89ccd5f7b66149a5a2a2126e28':
New spinner assets.
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 [Thu, 29 Sep 2011 08:18:57 +0000 (01:18 -0700)]
am
62969344: Add maskDebugInfo to display info for debugging build only.
* commit '
62969344d617c34c1dae2ed26f73018a097be4ce':
Add maskDebugInfo to display info for debugging build only.
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 07:23:36 +0000 (00:23 -0700)]
am
338d029f: Fix
5388852: Separate CropImage activity to another process to have more memory.
* commit '
338d029f0391b781bd6d1ee5ac1843fde1808f9a':
Fix
5388852: Separate CropImage activity to another process to have more memory.
Chih-Chung Chang [Thu, 29 Sep 2011 07:23:36 +0000 (00:23 -0700)]
am
6c1f01e2: Small UI tweak: only show fade-in animation when the bitmap has not been available for rendering before.
* commit '
6c1f01e21406a05dc7d3258001aa901bd8628a79':
Small UI tweak: only show fade-in animation when the bitmap has not been available for rendering before.
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:16:32 +0000 (20:16 -0700)]
am
15457fad: Merge "Change gallery crop interface to be consistent with widget resizing"
* commit '
15457fada6df984afe1b411a548f779bd7757f21':
Change gallery crop interface to be consistent with widget resizing
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:02:48 +0000 (17:02 -0700)]
am
91ca33ff: (-s ours) am
8b577a93: (-s ours) Import revised translations. DO NOT MERGE.
* commit '
91ca33ff77cbe9a2300c51fd48358223f1cbb789':
Import revised translations. DO NOT MERGE.
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:09:04 +0000 (08:09 -0700)]
am
9cf9756e: Merge "Fix
5384679: Back button doesn\'t work in Video Player"
* commit '
9cf9756e53c883ea3829b106aead60045754b610':
Fix
5384679: Back button doesn't work in Video Player
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:49:19 +0000 (04:49 -0700)]
am
1a9982e3: Merge "Fix
5158468: Hide system bar when no play control is shown."
* commit '
1a9982e33095c6fd664b5fc4f3e0856bd6326155':
Fix
5158468: Hide system bar when no play control is shown.
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:19:53 +0000 (00:19 -0700)]
am
2f5b778e: Merge "Fix
5367072: Add thumbnail fade-in animation."
* commit '
2f5b778e9a5814084e1d5ff191fd02b0149ef568':
Fix
5367072: Add thumbnail fade-in animation.
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 03:36:27 +0000 (20:36 -0700)]
am
31fa619b: Merge "Fix
5341761 gallery vibrate on confirm delete"
* commit '
31fa619bc23f75cd0f2999d4c9a37080ba1b87da':
Fix
5341761 gallery vibrate on confirm delete
Ray Chen [Wed, 28 Sep 2011 02:33:05 +0000 (19:33 -0700)]
Merge "Fix
5341761 gallery vibrate on confirm delete"
Eric Fischer [Wed, 28 Sep 2011 02:19:42 +0000 (19:19 -0700)]
am
1c33452d: (-s ours) am
6fef1583: (-s ours) Import revised translations. DO NOT MERGE
* commit '
1c33452d2503e90533d987e5cdd30d7a72ce6c6c':
Import revised translations. DO NOT MERGE
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:40:31 +0000 (10:40 -0700)]
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:16:47 +0000 (10:16 -0700)]
am
9aa6bc65: Reconcile with ics-factoryrom-release
* commit '
9aa6bc65f48dfef781eacd8065bff73011ff2e48':
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 14:27:17 +0000 (07:27 -0700)]
am
d5864a23: am
d8ad9c0d: Fix
5369640: Only accept content://media URI for photo editor.
* commit '
d5864a2301b3c0774881ffdf277c0d2168405240':
Fix
5369640: Only accept content://media URI for photo editor.
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:28:20 +0000 (22:28 -0700)]
am
d4a046c2: Fix
5299746: Update panorama thumbnail overlay.
* commit '
d4a046c2e1d6aece78a9a503d22eb5aca2243e33':
Fix
5299746: Update panorama thumbnail overlay.
Chih-Chung Chang [Tue, 27 Sep 2011 05:14:29 +0000 (22:14 -0700)]
am
ec412549: Move out PositionController from PhotoView.
* commit '
ec4125492f17130f65e49160a17bd437e01128a7':
Move out PositionController from PhotoView.
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:57:22 +0000 (13:57 -0700)]
am
9696bf89: (-s ours) am
9025dba3: (-s ours) (DO NOT MERGE)
* commit '
9696bf893a7391be9acbf243a5ec1d2e60c1482c':
(DO NOT MERGE)
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:15:41 +0000 (12:15 -0700)]
am
a34041de: Reconcile with ics-factoryrom-release
* commit '
a34041de9eb99c0f9eb87c8c797755665e3b9d09':
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 09:53:22 +0000 (02:53 -0700)]
am
77dcf077: Fix
5223982: Add animation when scrolling hits the edge.
* commit '
77dcf07756dcf918c56afb0a8f7605577a7ce8e0':
Fix
5223982: Add animation when scrolling hits the edge.
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:44:30 +0000 (15:44 -0700)]
am
b9413a35: (-s ours) am
1e62174e: (-s ours) Import revised translations. DO NOT MERGE
* commit '
b9413a357b2c30657584ac5d5c90e759f3147a19':
Import revised translations. DO NOT MERGE
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:06:48 +0000 (02:06 -0700)]
am
53eae8b0: Merge "Fix
5349519: The Select photo/video activity should use action bar."
* commit '
53eae8b02d2c29534ca74bc5feb2a2d8d7747d08':
Fix
5349519: The Select photo/video activity should use action bar.
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 08:23:52 +0000 (01:23 -0700)]
am
02e68998: Fix crop never returns
* commit '
02e689987f4af3b16b19352b1745478cca964d76':
Fix crop never returns
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:50:54 +0000 (21:50 -0700)]
am
0461b105: Merge "Fix
5223982: Adding one pixel transparent border around the texture."
* commit '
0461b1058ff1b3bb9933a6e912851eda0bddf46c':
Fix
5223982: Adding one pixel transparent border around the texture.
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 18:00:59 +0000 (11:00 -0700)]
am
0158328e: Reconcile with ics-factoryrom-release
* commit '
0158328eee783a953222511e9931f18893dce20f':
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:23:12 +0000 (06:23 -0700)]
am
29ea9ec5: Reconcile with ics-factoryrom-release
* commit '
29ea9ec5833d74a479321f432804f4178648d7f2':
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:26:46 +0000 (02:26 -0700)]
am
658773fe: Merge "Fix
5229466: Add "up" button to MovieActivity"
* commit '
658773fe7151ceacd32c3d853e48086d7ffd2cad':
Fix
5229466: Add "up" button to MovieActivity
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:33:03 +0000 (01:33 -0700)]
am
4c371990: Merge "Fix
5299746: Tweak layout and icons"
* commit '
4c3719904adf7138cb0686629e341fc9e2b073c8':
Fix
5299746: Tweak layout and icons
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:06:22 +0000 (23:06 -0700)]
am
9029b4a4: Merge "Fix
5299746: Update assets."
* commit '
9029b4a45cb8f12799d5fbf827c8a494ee99a0e0':
Fix
5299746: Update assets.
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:37:01 +0000 (22:37 -0700)]
am
e07d82c4: Merge "Fix tile-size to sync with the fix in factory branch."
* commit '
e07d82c4e813b0ea5fd00b76bf9f97e442109593':
Fix tile-size to sync with the fix in factory branch.
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 23:25:51 +0000 (16:25 -0700)]
am
1830e274: (-s ours) am
aa7fea54: (-s ours) Import revised translations. DO NOT MERGE
* commit '
1830e2740631589ef60ff6781e2189838fe1a326':
Import revised translations. DO NOT MERGE
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 21:16:01 +0000 (14:16 -0700)]
am
8416d769: Merge "Import revised translations."
* commit '
8416d769c31232a54f5bcc4e90e8335db5bf00ed':
Import revised translations.
Chih-Chung Chang [Tue, 20 Sep 2011 21:15:09 +0000 (14:15 -0700)]
am
992286ca: Merge "Fix
5224359: query width and height from media provider."
* commit '
992286cae8c88693228d21a12b9a514c3d932558':
Fix
5224359: query width and height from media provider.
Ruei-sung Lin [Tue, 20 Sep 2011 21:14:29 +0000 (14:14 -0700)]
am
f3f04f86: am
1ede9972: parameter change to match api
* commit '
f3f04f86e283044e7b165ef9e3fd6447e23c2c41':
parameter change to match api
Owen Lin [Tue, 20 Sep 2011 21:14:25 +0000 (14:14 -0700)]
am
4a827582: Merge "Lock rendering when switching state."
* commit '
4a827582bbe6a3c5f1fab0e43ad021c15983474e':
Lock rendering when switching state.
Owen Lin [Tue, 20 Sep 2011 21:14:19 +0000 (14:14 -0700)]
am
d3a9464b: Merge "Pause the playback of video if the activity is resumed after 3 mins."
* commit '
d3a9464bd4983158d20dd79de656ae5daf4070ee':
Pause the playback of video if the activity is resumed after 3 mins.
Hung-ying Tyan [Tue, 20 Sep 2011 21:14:19 +0000 (14:14 -0700)]
am
7b9ca694: Merge "Make the column type constants public in EntrySchema"
* commit '
7b9ca694e477754ab95f446e7de17ae57c9a0bd5':
Make the column type constants public in EntrySchema
OSDN Git Service
