OSDN Git Service
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: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 Automerger [Wed, 30 Nov 2011 14:46:42 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 29 Nov 2011 21:18:10 +0000 (13:18 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188
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
Eric Fischer [Mon, 21 Nov 2011 22:58:48 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81
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 [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
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
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
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 [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
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
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
Owen Lin [Mon, 7 Nov 2011 10:09:51 +0000 (18:09 +0800)]
Change OK to CROP fro CropImage.
fix:
5199444
Change-Id: I8ee74ba371c5537d7b86d771a202e0ac40668dfc
The Android Automerger [Sun, 6 Nov 2011 14:46:37 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ruei-sung Lin [Fri, 14 Oct 2011 01:20:07 +0000 (18:20 -0700)]
Add face tanning effect to gallery
bug:
5453164
Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
Chih-Chung Chang [Thu, 3 Nov 2011 16:40:39 +0000 (09:40 -0700)]
Merge "Fix
5543077: Gallery UI tweaks." into ics-mr1
The Android Automerger [Thu, 3 Nov 2011 13:44:37 +0000 (06:44 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 11:25:58 +0000 (19:25 +0800)]
Fix
5543077: Gallery UI tweaks.
Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
Ray Chen [Thu, 3 Nov 2011 10:04:14 +0000 (03:04 -0700)]
Merge "Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
Eric Fischer [Thu, 3 Nov 2011 00:04:24 +0000 (00:04 +0000)]
am
82635d92: (-s ours) Import revised translations. DO NOT MERGE
* commit '
82635d92bc0f2186da650a00fa458d1c542e2ec9':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 22:17:50 +0000 (15:17 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I6d64dfa6b24c8fdf56138637208d7e66ae95b7b2
The Android Automerger [Wed, 2 Nov 2011 13:46:36 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:36:36 +0000 (13:36 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib482395eb51431bb5c3f87f27c98f83f3281a88f
The Android Automerger [Sun, 30 Oct 2011 13:47:42 +0000 (06:47 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Sat, 29 Oct 2011 03:15:31 +0000 (03:15 +0000)]
am
8e10103f: (-s ours) Import revised translations. DO NOT MERGE
* commit '
8e10103fa8010a6756182a9a14c7504254dda36a':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Oct 2011 00:05:39 +0000 (17:05 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I838ee08834a0ab535519aa5886fb8593e49f59fc
Eric Fischer [Fri, 28 Oct 2011 21:00:52 +0000 (14:00 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:53:13 +0000 (13:53 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I76f98594896d654584cfa3d75a56264906837e46
Ray Chen [Fri, 28 Oct 2011 04:01:49 +0000 (12:01 +0800)]
Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
Change-Id: Icd160f688496c5e9e70c13889e9e393cad0dc428
Eric Fischer [Thu, 27 Oct 2011 21:46:48 +0000 (21:46 +0000)]
am
cceae7e7: (-s ours) Import revised translations. DO NOT MERGE
* commit '
cceae7e79d7a795c6007170c174930061e0654a7':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:52:22 +0000 (09:52 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I67c4dc34f67192f714172fbc5a82ff7cb8b81ff2
Eric Fischer [Thu, 27 Oct 2011 16:45:19 +0000 (09:45 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Automerger [Thu, 27 Oct 2011 13:47:20 +0000 (06:47 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 27 Oct 2011 00:40:16 +0000 (17:40 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ie311a298b5510a50728d61117a3855a866291ca4
Eric Fischer [Wed, 26 Oct 2011 21:08:54 +0000 (21:08 +0000)]
am
0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
0e711f17ec4252457453f8b9507aabc2a886d6d6':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 18:07:45 +0000 (11:07 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I078484fe3bb63f021b35d935e864604681265fe4
Eric Fischer [Wed, 26 Oct 2011 17:21:43 +0000 (10:21 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I4da74b8d117cfc2336730179daa364b800e73f23
The Android Automerger [Wed, 26 Oct 2011 14:05:32 +0000 (07:05 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Ed Heyl [Tue, 25 Oct 2011 19:50:40 +0000 (19:50 +0000)]
Merge remote branch 'goog/ics-mr0' into ics-mr1
Eric Fischer [Tue, 25 Oct 2011 00:02:22 +0000 (17:02 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Mon, 24 Oct 2011 23:50:03 +0000 (16:50 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9ad63e3c80298ad541519506d7164b49d84a5e30
Yuli Huang [Mon, 24 Oct 2011 06:38:25 +0000 (14:38 +0800)]
Fix b/
5500172: Remove unused face-tanning icon.
Change-Id: Ie25cd01df9a48c1c26e2403e42e58c5729b5238f
The Android Automerger [Sun, 23 Oct 2011 14:02:08 +0000 (07:02 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Fri, 21 Oct 2011 23:02:26 +0000 (16:02 -0700)]
am
de3412c5: (-s ours) Import revised translations. DO NOT MERGE
* commit '
de3412c5161fb727dee8b305bc114ea8806643a9':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 21:39:09 +0000 (14:39 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ia9fc268cf6f18f3b963f4891062f5589e4bf5d45
Eric Fischer [Fri, 21 Oct 2011 20:59:13 +0000 (13:59 -0700)]
am
ac3a825b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
ac3a825b6e7072c33779968a7c2d8d36a1f37e6e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 01:02:30 +0000 (18:02 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ieb1e402fd1f4caef7ec076b48a74666e5d215a75
Eric Fischer [Thu, 20 Oct 2011 18:34:25 +0000 (11:34 -0700)]
am
4e92cf0e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
4e92cf0e9c92bd497d7205f71139ef88bca57aca':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:31:49 +0000 (11:31 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:12:16 +0000 (11:12 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I558df3af8ecafa5b45163c52ff174ee52b79e4c0
Yuli Huang [Thu, 20 Oct 2011 16:28:07 +0000 (09:28 -0700)]
Yuli Huang [Thu, 20 Oct 2011 10:29:05 +0000 (18:29 +0800)]
Fix b/
5401109.
1. Add FlipView similar to existing RotateView.
2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and
add setRenderToFlip() in RendererUtils.
3. Make FlipAction use FlipView/PhotoView similar to how RotateAction
uses RotateView/PhotoView.
Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
The Android Automerger [Thu, 20 Oct 2011 14:01:36 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Wed, 19 Oct 2011 14:45:00 +0000 (07:45 -0700)]
merge in ics-release history after reset to master
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 06:37:02 +0000 (14:37 +0800)]
Fix
5213252 [UI] Updated action bar layouts and action orders
Change-Id: I46e993014e578be2e948ecea775522abc2f38a46
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
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.
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
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
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"
The Android Automerger [Tue, 11 Oct 2011 12:34:06 +0000 (05:34 -0700)]
merge in ics-release history after reset to master
OSDN Git Service
