c13be2a6d4
am fb95298f: (-s ours) am e30059fd: am fbb9146f: (-s ours) Merge change I452e3a4c into eclair
...
Merge commit 'fb95298f47388589752d0daa6bded568b7898864'
* commit 'fb95298f47388589752d0daa6bded568b7898864':
Import revised translations. DO NOT MERGE
2009-11-13 19:50:27 -08:00
0190cc872f
am c4aee241: am 5f9978e1: Merge change I9aaf24d2 into eclair
...
Merge commit 'c4aee241be8f57428141019481ed718af2b32175' into eclair-mr2-plus-aosp
* commit 'c4aee241be8f57428141019481ed718af2b32175':
Updated assets for Home.
2009-11-13 19:48:38 -08:00
fb95298f47
am e30059fd: am fbb9146f: (-s ours) Merge change I452e3a4c into eclair
...
Merge commit 'e30059fd29b470c152c74ffe64cc1562342f9088' into eclair-mr2-plus-aosp
* commit 'e30059fd29b470c152c74ffe64cc1562342f9088':
Import revised translations. DO NOT MERGE
2009-11-13 19:48:35 -08:00
c4aee241be
am 5f9978e1: Merge change I9aaf24d2 into eclair
...
Merge commit '5f9978e15a316d7618ca81a07691e0e46527783d' into eclair-mr2
* commit '5f9978e15a316d7618ca81a07691e0e46527783d':
Updated assets for Home.
2009-11-13 19:46:19 -08:00
5f9978e15a
Merge change I9aaf24d2 into eclair
...
* changes:
Updated assets for Home.
2009-11-13 19:43:59 -08:00
2c0a7aeb9f
Updated assets for Home.
...
Change-Id: I9aaf24d2ce0ef3333e969dcecd654459c80925ec
2009-11-13 19:40:33 -08:00
e30059fd29
am fbb9146f: (-s ours) Merge change I452e3a4c into eclair
...
Merge commit 'fbb9146f0a57084e8e5347aab0faec2e6f12b69a' into eclair-mr2
* commit 'fbb9146f0a57084e8e5347aab0faec2e6f12b69a':
Import revised translations. DO NOT MERGE
2009-11-13 17:53:11 -08:00
fbb9146f0a
Merge change I452e3a4c into eclair
...
* changes:
Import revised translations. DO NOT MERGE
2009-11-13 17:48:36 -08:00
452e3a4ce6
Import revised translations. DO NOT MERGE
...
Approver: jerryw
2009-11-13 17:22:57 -08:00
0880475a4a
am 03202d43: am 65f8e1cf: am 28c706b2: Use the appropriate flat icon for the folder menu in the Add dialog.
...
Merge commit '03202d43d4e52d078c743d05192d40420dbc5b7d'
* commit '03202d43d4e52d078c743d05192d40420dbc5b7d':
Use the appropriate flat icon for the folder menu in the Add dialog.
2009-11-13 16:27:30 -08:00
03202d43d4
am 65f8e1cf: am 28c706b2: Use the appropriate flat icon for the folder menu in the Add dialog.
...
Merge commit '65f8e1cf86d061391f313c8e73e21056c6132b83' into eclair-mr2-plus-aosp
* commit '65f8e1cf86d061391f313c8e73e21056c6132b83':
Use the appropriate flat icon for the folder menu in the Add dialog.
2009-11-13 16:24:27 -08:00
65f8e1cf86
am 28c706b2: Use the appropriate flat icon for the folder menu in the Add dialog.
...
Merge commit '28c706b2dd3a82ac28bab37149564d55198cc8cc' into eclair-mr2
* commit '28c706b2dd3a82ac28bab37149564d55198cc8cc':
Use the appropriate flat icon for the folder menu in the Add dialog.
2009-11-13 16:21:55 -08:00
28c706b2dd
Use the appropriate flat icon for the folder menu in the Add dialog.
...
Change-Id: Idb7ae2a50338f56317dd9f57c96129904b241e3a
2009-11-13 16:18:14 -08:00
3c44d72906
am 4f4a70d7: am 85c9a727: am 4b42cd85: Reorder wallpapers
...
Merge commit '4f4a70d7341b09d897d06aafea52a070e01b6f2d'
* commit '4f4a70d7341b09d897d06aafea52a070e01b6f2d':
Reorder wallpapers
2009-11-13 15:59:16 -08:00
c2e333a47b
am ad6053e0: am 714c4e35: am 257dd9f2: Merge change Iabf0a220 into eclair
...
Merge commit 'ad6053e0593a195f19cd54de5bf365671fea1582'
* commit 'ad6053e0593a195f19cd54de5bf365671fea1582':
Refresh of wallpapers.
2009-11-13 15:59:08 -08:00
4f4a70d734
am 85c9a727: am 4b42cd85: Reorder wallpapers
...
Merge commit '85c9a727677e19f695b03db3beace033efc5e34d' into eclair-mr2-plus-aosp
* commit '85c9a727677e19f695b03db3beace033efc5e34d':
Reorder wallpapers
2009-11-13 15:55:11 -08:00
ad6053e059
am 714c4e35: am 257dd9f2: Merge change Iabf0a220 into eclair
...
Merge commit '714c4e35fc233a7b5491f87c5470aead295960dc' into eclair-mr2-plus-aosp
* commit '714c4e35fc233a7b5491f87c5470aead295960dc':
Refresh of wallpapers.
2009-11-13 15:55:07 -08:00
85c9a72767
am 4b42cd85: Reorder wallpapers
...
Merge commit '4b42cd851a5467edb95c95192bd37c1168e8c899' into eclair-mr2
* commit '4b42cd851a5467edb95c95192bd37c1168e8c899':
Reorder wallpapers
2009-11-13 15:52:29 -08:00
714c4e35fc
am 257dd9f2: Merge change Iabf0a220 into eclair
...
Merge commit '257dd9f215155776ce2abd158d9fba7bdafdc6f8' into eclair-mr2
* commit '257dd9f215155776ce2abd158d9fba7bdafdc6f8':
Refresh of wallpapers.
2009-11-13 15:52:20 -08:00
4b42cd851a
Reorder wallpapers
...
Change-Id: I3110f0ded2b7b106bd3e761add4ef36ef3980f11
2009-11-13 15:48:42 -08:00
e7e76ca15a
Merge branch 'eclair' into eclair-release
2009-11-13 13:12:58 -08:00
7dfa1d4932
am 3db5c3fe: (-s ours) am 17793c1f: am 0e2a846d: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit '3db5c3fec31c163443aca42e8c7ebc372b0cd2f5'
* commit '3db5c3fec31c163443aca42e8c7ebc372b0cd2f5':
Import revised translations. DO NOT MERGE
2009-11-13 11:35:04 -08:00
257dd9f215
Merge change Iabf0a220 into eclair
...
* changes:
Refresh of wallpapers.
2009-11-13 11:30:30 -08:00
effb16fe4e
Refresh of wallpapers.
...
Change-Id: Iabf0a220214a86299371970dfd6dc60a15b2b9ee
2009-11-13 11:23:10 -08:00
3db5c3fec3
am 17793c1f: am 0e2a846d: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit '17793c1f01341c44db09eb45c333622dc3f84d14' into eclair-mr2-plus-aosp
* commit '17793c1f01341c44db09eb45c333622dc3f84d14':
Import revised translations. DO NOT MERGE
2009-11-13 11:12:20 -08:00
17793c1f01
am 0e2a846d: (-s ours) Import revised translations. DO NOT MERGE
...
Merge commit '0e2a846d575c8f4c92d499336959ef4f2cd82c81' into eclair-mr2
* commit '0e2a846d575c8f4c92d499336959ef4f2cd82c81':
Import revised translations. DO NOT MERGE
2009-11-13 10:42:47 -08:00
e2a508d531
Merge branch 'eclair' into eclair-release
2009-11-13 08:39:08 -08:00
590e31054e
am da6b5edd: am 67d90e9d: am 06d12abf: Merge change I464c055a into eclair
...
Merge commit 'da6b5eddba5a0dc610f8b41b0f5cc717ac1e55be'
* commit 'da6b5eddba5a0dc610f8b41b0f5cc717ac1e55be':
Bug 2244530 - Disable the attempt at not flickering. It's interfering with the frame rate while rollo animates in.
2009-11-12 23:22:03 -08:00
d33e5beae2
am 1e70e8fd: am d241fad4: am f2826c7e: Remove "Configure..." option from wallpaper chooser.
...
Merge commit '1e70e8fd9d395de9520251a14cdf0f8d8582031e'
* commit '1e70e8fd9d395de9520251a14cdf0f8d8582031e':
Remove "Configure..." option from wallpaper chooser.
2009-11-12 23:22:00 -08:00
344a58063d
am a394a37d: am 0cdc3466: am e26d9fc2: Update AllApps to defered surface attachment for RS.
...
Merge commit 'a394a37d60123bb9dc6a575b5c4de49d6bb9cd65'
* commit 'a394a37d60123bb9dc6a575b5c4de49d6bb9cd65':
Update AllApps to defered surface attachment for RS.
2009-11-12 23:21:56 -08:00
ff87a8eda5
am af80bdfa: am 010272d7: am 68ba5ca5: Keep banging on the launcher locks up bug. This moves the delayed zoom stuff into one place, so it should be out of sync less.
...
Merge commit 'af80bdfa99de5152288d2f125732a087d3f95089'
* commit 'af80bdfa99de5152288d2f125732a087d3f95089':
Keep banging on the launcher locks up bug. This moves the
2009-11-12 23:21:51 -08:00
270fa903ef
am 33e8fb7d: am e1a71134: am 24b6fd85: Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
...
Merge commit '33e8fb7d631a7c7c80eb4eeec374e2e4515688c6'
* commit '33e8fb7d631a7c7c80eb4eeec374e2e4515688c6':
Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
2009-11-12 23:21:47 -08:00
c5975df1cb
am 3753b4ae: am 37b91eb1: am 0faf71a1: Merge change Ieb9892d5 into eclair
...
Merge commit '3753b4ae2a7818a6f43be5e0a5e3b3c448212b02'
* commit '3753b4ae2a7818a6f43be5e0a5e3b3c448212b02':
Two wallpapers were missing from the list.
2009-11-12 23:21:42 -08:00
da6b5eddba
am 67d90e9d: am 06d12abf: Merge change I464c055a into eclair
...
Merge commit '67d90e9d46aa9f26472861e48c69c8e8a28ece21' into eclair-mr2-plus-aosp
* commit '67d90e9d46aa9f26472861e48c69c8e8a28ece21':
Bug 2244530 - Disable the attempt at not flickering. It's interfering with the frame rate while rollo animates in.
2009-11-12 23:18:12 -08:00
1e70e8fd9d
am d241fad4: am f2826c7e: Remove "Configure..." option from wallpaper chooser.
...
Merge commit 'd241fad4c6320789f2eaf9fc7d79d0635af8440d' into eclair-mr2-plus-aosp
* commit 'd241fad4c6320789f2eaf9fc7d79d0635af8440d':
Remove "Configure..." option from wallpaper chooser.
2009-11-12 23:18:08 -08:00
a394a37d60
am 0cdc3466: am e26d9fc2: Update AllApps to defered surface attachment for RS.
...
Merge commit '0cdc34660db036fda3714964c20888854aacfdd7' into eclair-mr2-plus-aosp
* commit '0cdc34660db036fda3714964c20888854aacfdd7':
Update AllApps to defered surface attachment for RS.
2009-11-12 23:18:05 -08:00
af80bdfa99
am 010272d7: am 68ba5ca5: Keep banging on the launcher locks up bug. This moves the delayed zoom stuff into one place, so it should be out of sync less.
...
Merge commit '010272d7e8e09f76044ba5d23d349594654b05d3' into eclair-mr2-plus-aosp
* commit '010272d7e8e09f76044ba5d23d349594654b05d3':
Keep banging on the launcher locks up bug. This moves the
2009-11-12 23:18:00 -08:00
33e8fb7d63
am e1a71134: am 24b6fd85: Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
...
Merge commit 'e1a71134e3227b43592b9699a716eba9c8669165' into eclair-mr2-plus-aosp
* commit 'e1a71134e3227b43592b9699a716eba9c8669165':
Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
2009-11-12 23:17:56 -08:00
3753b4ae2a
am 37b91eb1: am 0faf71a1: Merge change Ieb9892d5 into eclair
...
Merge commit '37b91eb10daeed68d12dff80fd1814158b103520' into eclair-mr2-plus-aosp
* commit '37b91eb10daeed68d12dff80fd1814158b103520':
Two wallpapers were missing from the list.
2009-11-12 23:17:51 -08:00
67d90e9d46
am 06d12abf: Merge change I464c055a into eclair
...
Merge commit '06d12abf6368e7b2277e70332e945d6fcf5ee1c8' into eclair-mr2
* commit '06d12abf6368e7b2277e70332e945d6fcf5ee1c8':
Bug 2244530 - Disable the attempt at not flickering. It's interfering with the frame rate while rollo animates in.
2009-11-12 23:09:19 -08:00
d241fad4c6
am f2826c7e: Remove "Configure..." option from wallpaper chooser.
...
Merge commit 'f2826c7e2131ad9d81810b4bd7e3f0b120bbc97c' into eclair-mr2
* commit 'f2826c7e2131ad9d81810b4bd7e3f0b120bbc97c':
Remove "Configure..." option from wallpaper chooser.
2009-11-12 23:08:52 -08:00
0cdc34660d
am e26d9fc2: Update AllApps to defered surface attachment for RS.
...
Merge commit 'e26d9fc2876bec60d5fb09c58efaa715ef6ab2fb' into eclair-mr2
* commit 'e26d9fc2876bec60d5fb09c58efaa715ef6ab2fb':
Update AllApps to defered surface attachment for RS.
2009-11-12 23:08:48 -08:00
0e2a846d57
Import revised translations. DO NOT MERGE
...
Approver: jerryw
2009-11-12 20:01:40 -08:00
06d12abf63
Merge change I464c055a into eclair
...
* changes:
Bug 2244530 - Disable the attempt at not flickering. It's interfering with the frame rate while rollo animates in.
2009-11-12 18:58:03 -08:00
f2826c7e21
Remove "Configure..." option from wallpaper chooser.
...
Change-Id: Iae9719dc3197ea0ee8e7637456b9d76d9ce8622b
2009-11-12 18:38:17 -08:00
464c055a7a
Bug 2244530 - Disable the attempt at not flickering. It's interfering with the frame rate while rollo animates in.
2009-11-12 18:19:47 -08:00
e26d9fc287
Update AllApps to defered surface attachment for RS.
2009-11-12 15:09:21 -08:00
74292a343e
Keep banging on the launcher locks up bug. This moves the
...
delayed zoom stuff into one place, so it should be out of
sync less.
2009-11-12 14:54:49 -08:00
0f9bd2f799
Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
2009-11-12 14:54:40 -08:00
ed1cfef5ef
Fix bug 2258128 - homescreen on Passion unresponsive while still not leaking the contexts.
2009-11-12 14:54:26 -08:00
Eric Fischer
Romain Guy
Android (Google) Code Review
The Android Automerger
Joe Onorato
Jason Sams