OSDN Git Service
Ray Chen [Thu, 3 Nov 2011 10:22:36 +0000 (10:22 +0000)]
am
da9f0c77: Merge "Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
* commit '
da9f0c773aa6c9ba228f30811df35d2c601dfdb6':
Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
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:43:25 +0000 (00:43 +0000)]
am
e617b945: (-s ours) am
82635d92: (-s ours) Import revised translations. DO NOT MERGE
* commit '
e617b945b25f0034ff3136457b32bfe39b6d3e08':
Import revised translations. DO NOT MERGE
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
Eric Fischer [Wed, 2 Nov 2011 21:13:37 +0000 (14:13 -0700)]
Merge "Import revised translations."
Eric Fischer [Wed, 2 Nov 2011 17:31:30 +0000 (17:31 +0000)]
am
d1e3e976: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
d1e3e97606b850022cced61bafb50a1989b76d15':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 17:22:58 +0000 (10:22 -0700)]
Import revised translations.
Change-Id: Iabba637909aec27731a7a991b3b8540da1c9b957
Eric Fischer [Tue, 1 Nov 2011 20:36:36 +0000 (13:36 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib482395eb51431bb5c3f87f27c98f83f3281a88f
The Android Open Source Project [Mon, 31 Oct 2011 20:19:29 +0000 (13:19 -0700)]
Reconcile with ics-mr1-release
Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e
Eric Fischer [Mon, 31 Oct 2011 12:26:47 +0000 (12:26 +0000)]
am
9c1fecf0: (-s ours) am
8e10103f: (-s ours) Import revised translations. DO NOT MERGE
* commit '
9c1fecf0a6e2325f72f56ba32bd0703314e0ef30':
Import revised translations. DO NOT MERGE
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 22:27:58 +0000 (22:27 +0000)]
am
eb9aa98a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
eb9aa98ad005f2accbc4f9566e49d685d2213493':
Import revised translations. DO NOT MERGE
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
Eric Fischer [Fri, 28 Oct 2011 19:14:11 +0000 (12:14 -0700)]
Merge "Import revised translations."
Eric Fischer [Fri, 28 Oct 2011 18:24:34 +0000 (11:24 -0700)]
Import revised translations.
Change-Id: Ib3f108fe3ad63e2621e439893494a48348a6b2ec
Claudia de Veaux [Fri, 28 Oct 2011 04:39:34 +0000 (21:39 -0700)]
Merge "Edits to newly-added error messages, per UI text standards. Bugs:
5165745,
5162668"
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:54:12 +0000 (21:54 +0000)]
am
1f7c6c68: (-s ours) am
cceae7e7: (-s ours) Import revised translations. DO NOT MERGE
* commit '
1f7c6c68c3e7d416d37ab3ce7d5ade86c0f899b1':
Import revised translations. DO NOT MERGE
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
Claudia de Veaux [Thu, 27 Oct 2011 20:41:33 +0000 (13:41 -0700)]
Edits to newly-added error messages, per UI text standards.
Bugs:
5165745,
5162668
Change-Id: I935ea51e608ef1941296f140878fc5146d12aa25
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:51:07 +0000 (16:51 +0000)]
am
748e7efc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
748e7efccccb61e8ce9e9ac86a6f2c8987bbcefb':
Import revised translations. DO NOT MERGE
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:14:56 +0000 (21:14 +0000)]
am
b633e313: (-s ours) am
0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
b633e313820d725f7f56fe016494796a2413c549':
Import revised translations. DO NOT MERGE
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:34:23 +0000 (18:34 +0000)]
am
1e7b81dc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
1e7b81dcd0bf9b6a2bd90fc5895437656725ea34':
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
Ed Heyl [Wed, 26 Oct 2011 14:57:59 +0000 (14:57 +0000)]
am
2015a3c3: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '
2015a3c36930045d6268871e9c6907533d863702':
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 18:44:55 +0000 (11:44 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 25 Oct 2011 17:51:42 +0000 (10:51 -0700)]
Import revised translations.
Change-Id: I4ba6ad38f5924e8ed58d44ec5ffb303f5c5f7faa
Chih-Chung Chang [Tue, 25 Oct 2011 06:55:37 +0000 (23:55 -0700)]
Merge "Fix
5454748: Localize hardcoded folder names."
Eric Fischer [Tue, 25 Oct 2011 00:03:56 +0000 (17:03 -0700)]
am
5fcef11e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
5fcef11e93ea473c7abe63555d0124257e520d19':
Import revised translations. DO NOT MERGE
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 19:46:16 +0000 (12:46 -0700)]
am
e334568e: Fix b/
5500172: Remove unused face-tanning icon.
* commit '
e334568eec58601254df46111a5fe1331b775e54':
Fix b/
5500172: Remove unused face-tanning icon.
Chih-Chung Chang [Mon, 24 Oct 2011 07:56:30 +0000 (15:56 +0800)]
Fix
5454748: Localize hardcoded folder names.
Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
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
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
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 [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
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
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
The Android Automerger [Wed, 5 Oct 2011 13:59:20 +0000 (06:59 -0700)]
merge in ics-release history after reset to master
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
OSDN Git Service
