OSDN Git Service
The Android Open Source Project [Mon, 23 Apr 2012 21:42:28 +0000 (14:42 -0700)]
am
49826d43: Reconcile with ics-mr1-release
* commit '
49826d43d1911939ccb1ac1ee9755ba5057065f6':
Patch 2 for MR1.
Patch for MR1.
The Android Open Source Project [Mon, 23 Apr 2012 21:40:27 +0000 (14:40 -0700)]
Reconcile with ics-mr1-release
Change-Id: If202c8b713a5d273115764c404cbe45a88c8d658
Chih-Chung Chang [Wed, 21 Mar 2012 11:01:30 +0000 (19:01 +0800)]
Patch 2 for MR1.
Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
Chih-Chung Chang [Tue, 20 Mar 2012 12:56:49 +0000 (20:56 +0800)]
Patch for MR1.
Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
Chih-Chung Chang [Mon, 16 Apr 2012 22:55:30 +0000 (15:55 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:55:29 +0000 (15:55 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:54:13 +0000 (15:54 -0700)]
am
da7c5fab: am
42c1892a: Patch 2 for MR1.
* commit '
da7c5fab68cb65d0535d230b9487bfaa5d6ded56':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:54:12 +0000 (15:54 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:01 +0000 (15:52 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:52:00 +0000 (15:52 -0700)]
Chih-Chung Chang [Mon, 16 Apr 2012 22:51:55 +0000 (15:51 -0700)]
am
42c1892a: Patch 2 for MR1.
* commit '
42c1892ab508a02ea957fe8796086362e163c123':
Patch 2 for MR1.
Chih-Chung Chang [Mon, 16 Apr 2012 22:51:54 +0000 (15:51 -0700)]
Chih-Chung Chang [Wed, 21 Mar 2012 11:01:30 +0000 (19:01 +0800)]
Patch 2 for MR1.
Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
Chih-Chung Chang [Tue, 20 Mar 2012 12:56:49 +0000 (20:56 +0800)]
Patch for MR1.
Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
The Android Open Source Project [Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)]
am
aa5bdb1a: Reconcile with ics-mr1-release
* commit '
aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':
The Android Open Source Project [Thu, 16 Feb 2012 18:10:54 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I5fc102975a6f3ef9fe1fa8c73260b9571dce0e1a
The Android Open Source Project [Thu, 16 Feb 2012 18:06:44 +0000 (10:06 -0800)]
am
5e73e2dc: Reconcile with ics-mr1-release
* commit '
5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0':
The Android Open Source Project [Thu, 16 Feb 2012 18:02:59 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b
The Android Automerger [Tue, 14 Feb 2012 22:16:37 +0000 (14:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Fri, 10 Feb 2012 18:13:20 +0000 (10:13 -0800)]
am
70992e04: (-s ours) am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
70992e04d00e6708d33adbb7c016499b6e030d68':
Justin Ho [Fri, 10 Feb 2012 18:10:55 +0000 (10:10 -0800)]
am
4e1e57fd: am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
4e1e57fdba6999cb46f1f72eb529ffbb68be83a6':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:09:34 +0000 (10:09 -0800)]
am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
a64072a481580cbe3f3166f0c6d4424b20f1275c':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:08:47 +0000 (10:08 -0800)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp
Eric Fischer [Fri, 10 Feb 2012 18:08:30 +0000 (10:08 -0800)]
am
3293fee0: am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
3293fee0e28ee082b91e171ae83c2dde6af2c036':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:08:29 +0000 (10:08 -0800)]
am
3f9bc412: (-s ours) am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
3f9bc4128e2f59cef855863dcb71de5d0ecaf69b':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:08:14 +0000 (10:08 -0800)]
am
a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
a64072a481580cbe3f3166f0c6d4424b20f1275c':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:06:24 +0000 (10:06 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Fri, 10 Feb 2012 18:05:40 +0000 (10:05 -0800)]
am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
dfeefe6a7a3ede9735c9f90dae99d5e354b621b7':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:05:09 +0000 (10:05 -0800)]
am
dfeefe6a: Import translations. DO NOT MERGE
* commit '
dfeefe6a7a3ede9735c9f90dae99d5e354b621b7':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 02:34:03 +0000 (18:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied427c7a1b1e87e666b170a5aa533c638bab97a3
Eric Fischer [Thu, 9 Feb 2012 02:08:34 +0000 (18:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d1ba410c706ae3d540af1b1b8cdf260ceb517eb
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
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 19:45:24 +0000 (11:45 -0800)]
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
The Android Open Source Project [Thu, 8 Dec 2011 18:22:15 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3ff57eb4e0a33e875d39ce06a12f6809bc5f50db
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:31:50 +0000 (12:31 -0800)]
Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
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
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 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: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: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
Wei Huang [Tue, 29 Nov 2011 17:58:18 +0000 (09:58 -0800)]
Merge "Show a dialog to require updating PlusOne." into ics-mr1
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 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 [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:56:35 +0000 (04:56 -0800)]
Merge "Fix
5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
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
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 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 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
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
The Android Automerger [Sun, 13 Nov 2011 14:47:17 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ray Chen [Thu, 3 Nov 2011 09:51:38 +0000 (17:51 +0800)]
Fix
5481444 Face clustering should use PWA profile shot instead of random photo
Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
Ray Chen [Fri, 11 Nov 2011 07:33:43 +0000 (23:33 -0800)]
Merge "Fix
5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:34:30 +0000 (22:34 -0800)]
Merge "Request sync when opening Gallery/Album." into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:33:16 +0000 (22:33 -0800)]
Merge "Show control overlay when earphone is unplugged" into ics-mr1
Owen Lin [Fri, 11 Nov 2011 04:01:09 +0000 (12:01 +0800)]
Show control overlay when earphone is unplugged
Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5
fix:
5563251
Yuli Huang [Fri, 11 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix b/
5518211 by disabling effects when photo cannot be loaded." into ics-mr1
Owen Lin [Tue, 8 Nov 2011 11:05:56 +0000 (19:05 +0800)]
Request sync when opening Gallery/Album.
fix:
5519437
Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
The Android Automerger [Thu, 10 Nov 2011 14:47:10 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Thu, 10 Nov 2011 10:01:33 +0000 (18:01 +0800)]
Fix
5548567: Don't play video immediately.
Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
Ray Chen [Wed, 9 Nov 2011 02:49:09 +0000 (10:49 +0800)]
Fix
5213252 [UI] Updated action bar layouts and action orders
Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
Yuli Huang [Thu, 10 Nov 2011 08:50:31 +0000 (16:50 +0800)]
Fix b/
5518211 by disabling effects when photo cannot be loaded.
Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
Chih-Chung Chang [Thu, 10 Nov 2011 04:17:38 +0000 (20:17 -0800)]
Merge "Fix
5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
Yuli Huang [Wed, 9 Nov 2011 18:10:10 +0000 (02:10 +0800)]
Fix b/
5587210: Add file extension to display-name.
Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
The Android Automerger [Wed, 9 Nov 2011 18:06:23 +0000 (10:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 9 Nov 2011 14:47:40 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Wed, 9 Nov 2011 12:57:53 +0000 (20:57 +0800)]
Fix
5585254: Make system UI enter "low profile mode" while playing.
Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
Yuli Huang [Wed, 9 Nov 2011 07:10:45 +0000 (15:10 +0800)]
Fix b/
5510870 by persisting states of save/share buttons.
Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
Yuli Huang [Fri, 4 Nov 2011 08:39:50 +0000 (16:39 +0800)]
Fix b/
5510870 by saving/restoring Activity states.
1. Filters implement Parcelable for saving/restoring states.
2. Extract Doodle for making doodling paths parcelable.
Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
The Android Automerger [Tue, 8 Nov 2011 14:46:22 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Yuli Huang [Tue, 8 Nov 2011 03:58:36 +0000 (19:58 -0800)]
Merge "Add face tanning effect to gallery" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:36:26 +0000 (12:36 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:26:25 +0000 (12:26 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I60c0c0e36909fdad936f20880904a18ccddb503c