OSDN Git Service
Eric Fischer [Thu, 2 Feb 2012 20:05:26 +0000 (12:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec8e38ba94d3c159c59715961d98e4cfa7d4fd1f
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 [Thu, 2 Feb 2012 02:32:06 +0000 (18:32 -0800)]
Merge "Localize the "fail to load image" toast message."
The Android Open Source Project [Wed, 1 Feb 2012 18:06:21 +0000 (10:06 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:24 +0000 (10:01 -0800)]
am
79c31703: Reconcile with ics-mr1-release
* commit '
79c31703151da5eaf8fb74a249091ddd54d0c2e9':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:34 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I65ae67dd34f8ee65190369e77739b02e9937ab6c
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
Eric Fischer [Tue, 31 Jan 2012 19:14:48 +0000 (11:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie3311b4e9c1a346ffd070c1984dd252e6c39e77c
Eric Fischer [Mon, 30 Jan 2012 22:50:09 +0000 (14:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I23a1773bd5c2e54b8f9d15df26515c5c622877c9
Eric Fischer [Thu, 26 Jan 2012 22:08:45 +0000 (14:08 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 26 Jan 2012 22:08:32 +0000 (14:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4029bac1a72d77309819d59be84bc2e223711d6a
Eric Fischer [Thu, 26 Jan 2012 21:45:09 +0000 (13:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id2ddcf510c73a66027810668fd2601893f90d2df
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
Eric Fischer [Thu, 29 Dec 2011 20:18:49 +0000 (12:18 -0800)]
Import revised translations.
Change-Id: Iafdc61f194153262e70e0cd76253f8e816d6ac31
Owen Lin [Wed, 14 Dec 2011 07:50:27 +0000 (23:50 -0800)]
Merge "Support querying account and picasa id of a picasa image."
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
Owen Lin [Mon, 12 Dec 2011 07:07:28 +0000 (15:07 +0800)]
Make sure the backgroud is cleared in MovieActivity.
Change-Id: I1a08c2df1a5c26bcb8de0900ec9c593c0f974d3d
fix:
5742974
The Android Open Source Project [Fri, 9 Dec 2011 22:57:52 +0000 (14:57 -0800)]
am
520b7ee0: Reconcile with ics-mr1-release
* commit '
520b7ee0f0f3e0b1e2424f64a0c0912d4c19bf19':
The Android Open Source Project [Thu, 8 Dec 2011 18:22:15 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3ff57eb4e0a33e875d39ce06a12f6809bc5f50db
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.
Daniel Sandler [Thu, 1 Dec 2011 20:31:50 +0000 (12:31 -0800)]
Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
Jeff Sharkey [Thu, 1 Dec 2011 19:48:20 +0000 (11:48 -0800)]
resolved conflicts for merge of
c0715fd5 to master
Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20
Daniel Sandler [Thu, 1 Dec 2011 16:19:37 +0000 (11:19 -0500)]
Remove dependency on support library. DO NOT MERGE.
Bug:
5689684
Change-Id: I95d1090b91302dc6686d36768721cca61e9d1249
Yuli Huang [Mon, 28 Nov 2011 12:05:27 +0000 (20:05 +0800)]
Refactor to remove obsolete design and improve code consistency.
1. Remove isValid()/validate() in Filter; EffectAction would push
filters into the stack when being notified by notifyChanged().
2. Make RedEyeAction consistent with DoodleAction by ignoring
out-of-bounds operations.
3. Improve consistency by encapsulate effect-tool creation/removal in
one class (EffectToolFactory).
4. Minimize variable visibility in EffectAction subclasses.
5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch.
Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
Owen Lin [Thu, 1 Dec 2011 06:43:54 +0000 (14:43 +0800)]
Add close() to Download cache.
Change-Id: Idf0482e9f3cd2f667dca902ffea75bb0a0225d2d
fix:
5664497
The Android Open Source Project [Wed, 30 Nov 2011 20:56:14 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
Chih-Chung Chang [Wed, 30 Nov 2011 18:51:06 +0000 (10:51 -0800)]
am
764482c4: Merge "Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
* commit '
764482c4ebffc9c3cac21fcd8707811e981cd092':
Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Chih-Chung Chang [Wed, 30 Nov 2011 18:51:00 +0000 (10:51 -0800)]
am
002a3fec: Fix
5686493: Crash when try to click any thumbnail
* commit '
002a3fece284f713537fad4523ee963d257350e9':
Fix
5686493: Crash when try to click any thumbnail
Daniel Sandler [Wed, 30 Nov 2011 18:50:55 +0000 (10:50 -0800)]
am
45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1
* commit '
45fa677140112f725df3765be56edc715c226aa5':
Improve screen on/off logic in slideshow.
The Android Automerger [Wed, 30 Nov 2011 14:46:42 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Wed, 30 Nov 2011 07:56:44 +0000 (23:56 -0800)]
Merge "Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
Chih-Chung Chang [Wed, 30 Nov 2011 06:32:35 +0000 (14:32 +0800)]
Fix
5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
Chih-Chung Chang [Wed, 30 Nov 2011 05:19:17 +0000 (13:19 +0800)]
Fix
5686493: Crash when try to click any thumbnail
Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
Daniel Sandler [Wed, 30 Nov 2011 02:19:16 +0000 (18:19 -0800)]
Merge "Improve screen on/off logic in slideshow." into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 21:30:39 +0000 (13:30 -0800)]
am
4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
4e94e8858fc3187ec0eae83c70698c85115a630e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:26:56 +0000 (13:26 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 21:18:10 +0000 (13:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188
Jeff Brown [Tue, 29 Nov 2011 21:17:43 +0000 (13:17 -0800)]
am
881fd799: Merge "Add application launch category." into ics-mr1
* commit '
881fd799f1c54b934aa90310a54a145062264422':
Add application launch category.
Jeff Brown [Tue, 29 Nov 2011 21:14:17 +0000 (13:14 -0800)]
Merge "Add application launch category." into ics-mr1
The Android Automerger [Tue, 29 Nov 2011 20:03:31 +0000 (12:03 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 29 Nov 2011 19:07:11 +0000 (11:07 -0800)]
Merge "Import revised translations."
Eric Fischer [Tue, 29 Nov 2011 19:04:51 +0000 (11:04 -0800)]
Import revised translations.
Change-Id: I8bc47cbeb77931dd7003ce173680b39fd411b260
Wei Huang [Tue, 29 Nov 2011 18:04:02 +0000 (10:04 -0800)]
am
622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1
* commit '
622c2b2c7721008e7851d0af3d89d3fc545ceaf6':
Show a dialog to require updating PlusOne.
Wei Huang [Tue, 29 Nov 2011 17:58:18 +0000 (09:58 -0800)]
Merge "Show a dialog to require updating PlusOne." into ics-mr1
Chih-Chung Chang [Tue, 29 Nov 2011 17:56:48 +0000 (09:56 -0800)]
am
fc8c503d: Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
* commit '
fc8c503d1351c6ee62d233a944f2bd5220e64a55':
Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
Daniel Sandler [Mon, 28 Nov 2011 16:43:23 +0000 (11:43 -0500)]
Improve screen on/off logic in slideshow.
When used as a screensaver or otherwise, the slideshow
should not keep the screen on if the device is not plugged
in. It should also allow the screen to lock while the
slideshow is playing (otherwise a device left in this state
may be left unsecured for long periods by accident).
Additionally, when used as a screensaver, it must dismiss
the keyguard in order to be shown on a secured device.
Bug:
5660833
Change-Id: I1bafc50127aaa7ae2b67235d30736faa606c5ac1
Chih-Chung Chang [Tue, 29 Nov 2011 06:21:11 +0000 (14:21 +0800)]
Fix
5661035: Accepts bluetooth keys while playing a video from gallery.
Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
Jeff Brown [Tue, 29 Nov 2011 01:23:56 +0000 (17:23 -0800)]
Add application launch category.
Bug:
5674723
Change-Id: I6e2cbd2f456d93b4a4e05df5f3be5d3fb05385f0
The Android Automerger [Mon, 28 Nov 2011 20:22:56 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Owen Lin [Thu, 24 Nov 2011 03:59:52 +0000 (11:59 +0800)]
Show a dialog to require updating PlusOne.
Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca
fix:
5608342
The Android Open Source Project [Tue, 22 Nov 2011 21:26:13 +0000 (13:26 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id5562da0ab0f961c8263b5a101a2ed3e32bd9b58
The Android Automerger [Tue, 22 Nov 2011 19:56:44 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 22 Nov 2011 05:08:11 +0000 (21:08 -0800)]
am
f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
f36d8f299d57849a1afb1b0c271bb4be0d336e43':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:26:05 +0000 (15:26 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 21 Nov 2011 22:58:48 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81
Chih-Chung Chang [Mon, 21 Nov 2011 12:59:31 +0000 (04:59 -0800)]
am
8cbc7c4e: Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
* commit '
8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74':
Fix
5637927: NPE while trying to do slide show for gmail image attachment
Chih-Chung Chang [Mon, 21 Nov 2011 12:56:35 +0000 (04:56 -0800)]
Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
The Android Open Source Project [Fri, 18 Nov 2011 23:43:37 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
Ray Chen [Fri, 18 Nov 2011 23:23:07 +0000 (15:23 -0800)]
am
00b5f3c6: Fix
5635260 Albums view goes blank after changing view option and returning to albums view
* commit '
00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa':
Fix
5635260 Albums view goes blank after changing view option and returning to albums view
Wei Huang [Fri, 18 Nov 2011 10:37:31 +0000 (02:37 -0800)]
am
71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1
* commit '
71a296c27389fefa9361adada41715ae4623af32':
Make sure startAnimation won't be called after onPause.
Chih-Chung Chang [Fri, 18 Nov 2011 10:04:10 +0000 (18:04 +0800)]
Fix
5637927: NPE while trying to do slide show for gmail image attachment
Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
Ray Chen [Fri, 18 Nov 2011 07:00:32 +0000 (15:00 +0800)]
Fix
5635260 Albums view goes blank after changing view option and returning to albums view
Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
Wei Huang [Fri, 18 Nov 2011 00:56:49 +0000 (16:56 -0800)]
Merge "Make sure startAnimation won't be called after onPause." into ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:47:04 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 17 Nov 2011 13:45:46 +0000 (05:45 -0800)]
am
612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
612e9d697269cff5437366ae386dea7d6af6656c':
Import revised translations. DO NOT MERGE
Owen Lin [Thu, 17 Nov 2011 07:26:56 +0000 (15:26 +0800)]
Make sure startAnimation won't be called after onPause.
Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03
fix:
5629252
Eric Fischer [Wed, 16 Nov 2011 18:53:11 +0000 (10:53 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 18:17:05 +0000 (10:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f
The Android Automerger [Wed, 16 Nov 2011 14:46:48 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ray Chen [Wed, 16 Nov 2011 08:12:02 +0000 (00:12 -0800)]
am
d7401652: Fix
5611147 attachments (picture) can\'t be viewed after they\'re saved
* commit '
d74016524fa899747411240daa453e5ca9cac219':
Fix
5611147 attachments (picture) can't be viewed after they're saved
Ray Chen [Wed, 16 Nov 2011 03:12:47 +0000 (11:12 +0800)]
Fix
5611147 attachments (picture) can't be viewed after they're saved
Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
Eric Fischer [Tue, 15 Nov 2011 21:11:10 +0000 (13:11 -0800)]
am
8ab8a64c: (-s ours) am
756f9bc7: Import revised translations. DO NOT MERGE
* commit '
8ab8a64cc40a683d364829aad404fea4548cbd48':
Import revised translations. DO NOT MERGE
Wei Huang [Tue, 15 Nov 2011 21:11:00 +0000 (13:11 -0800)]
am
bfbd7bb4: Merge "Fix
5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
* commit '
bfbd7bb47582be2a636eadffb041a698c52817f6':
Fix
5481444 Face clustering should use PWA profile shot instead of random photo
Yuli Huang [Tue, 15 Nov 2011 21:06:55 +0000 (13:06 -0800)]
am
c5d42ff7: Merge "Fix b/
5517002 by dismissing running progress dialog in onPause()." into ics-mr1
* commit '
c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b':
Fix b/
5517002 by dismissing running progress dialog in onPause().
Eric Fischer [Tue, 15 Nov 2011 20:19:48 +0000 (12:19 -0800)]
am
756f9bc7: Import revised translations. DO NOT MERGE
* commit '
756f9bc72468a6fba926602b86525aed7bb05b40':
Import revised translations. DO NOT MERGE
Wei Huang [Tue, 15 Nov 2011 20:12:03 +0000 (12:12 -0800)]
Merge "Fix
5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
Owen Lin [Tue, 15 Nov 2011 19:30:08 +0000 (11:30 -0800)]
am
c903fd67: Fix the memory leak by WeakHashMap.
* commit '
c903fd67c26d652f9dbd5cb321b64d1601357985':
Fix the memory leak by WeakHashMap.
Yuli Huang [Tue, 15 Nov 2011 15:18:16 +0000 (07:18 -0800)]
Merge "Fix b/
5517002 by dismissing running progress dialog in onPause()." into ics-mr1
The Android Automerger [Tue, 15 Nov 2011 14:46:32 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Yuli Huang [Mon, 14 Nov 2011 14:38:16 +0000 (22:38 +0800)]
Fix b/
5517002 by dismissing running progress dialog in onPause().
Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
Eric Fischer [Mon, 14 Nov 2011 21:32:51 +0000 (13:32 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I325ec90678dbd808dc4cab87de77ddfcc8ececf2
Owen Lin [Mon, 14 Nov 2011 04:23:03 +0000 (12:23 +0800)]
Fix the memory leak by WeakHashMap.
fix:
5601885
Also simplify the code.
Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447
OSDN Git Service
