c5e51d1cad
am a609ab49: am cdda1cee: fix the build
...
* commit 'a609ab4940a2a64224b35d7ae32d00ce4d9aee5f':
fix the build
2011-01-30 16:15:25 -08:00
a609ab4940
am cdda1cee: fix the build
...
* commit 'cdda1cee561622d111b0c5d654003a296d1d2b7a':
fix the build
2011-01-30 16:11:45 -08:00
cdda1cee56
fix the build
...
Gerrit mysteriously added a close branch to winson's change, but it's not showing up on his machine. strange.
2011-01-30 15:55:59 -08:00
c6bbfb6e9b
am 983be8ac: am 6c58d9e3: Merge "Calling removeItems() should mark the item\'s previous cell as unoccupied. (3405806)" into honeycomb
...
* commit '983be8ac0aeed98e7e9171c025e172ad88a513d0':
Calling removeItems() should mark the item's previous cell as unoccupied. (3405806)
2011-01-30 15:20:56 -08:00
983be8ac0a
am 6c58d9e3: Merge "Calling removeItems() should mark the item\'s previous cell as unoccupied. (3405806)" into honeycomb
...
* commit '6c58d9e385dae56d68b62bc504af689f5af6b1c9':
Calling removeItems() should mark the item's previous cell as unoccupied. (3405806)
2011-01-30 15:18:31 -08:00
6c58d9e385
Merge "Calling removeItems() should mark the item's previous cell as unoccupied. (3405806)" into honeycomb
2011-01-30 15:15:10 -08:00
c896b7c57c
merge in honeycomb-release history after reset to honeycomb
2011-01-30 13:37:53 -08:00
7a25a9e39a
Calling removeItems() should mark the item's previous cell as unoccupied. (3405806)
...
Change-Id: I99de0149dea5b487ed75e2469478e2346cd5b5df
2011-01-30 13:34:42 -08:00
55ebfa09a4
am bf838a66: Reconcile gingerbread-plus-aosp and honeycomb
...
* commit 'bf838a662e1bd2c5e4af6a9dd3c37625be020fdd':
2011-01-30 12:55:40 -08:00
8679c4d8ff
Mass merge from gingerbread - do not merge
...
Change-Id: I9111f11e0f85577b96556a5f996bf81b4f997de9
2011-01-30 12:41:58 -08:00
bf838a662e
Reconcile gingerbread-plus-aosp and honeycomb
...
Change-Id: I048900235e7de3f5be0f0ede44cd6793874cf18f
2011-01-30 12:41:58 -08:00
186bfb5802
merge in honeycomb-release history after reset to honeycomb
2011-01-30 09:59:12 -08:00
6fe9a20fb9
am cb0f4ff0: am cf6125c2: Improving performance of state transitions
...
* commit 'cb0f4ff0f89719547d8364c3bfa86f14c6849efb':
Improving performance of state transitions
2011-01-29 21:51:37 -08:00
cb0f4ff0f8
am cf6125c2: Improving performance of state transitions
...
* commit 'cf6125c2d30ce02d8ab6cbe8e37a20f6a831e216':
Improving performance of state transitions
2011-01-29 21:48:59 -08:00
cf6125c2d3
Improving performance of state transitions
...
- Caching CellLayouts to bitmaps when they're small again
- Enabling hardware layers on customize tray/all apps during transition
Change-Id: Ia4f5f7b608a9d013ed48b990551fd1b9de503b32
2011-01-29 18:26:09 -08:00
ee083eb573
am f7be630c: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'f7be630c94a9a5bfd8992d5b538f81a8e894b552':
Import revised translations. DO NOT MERGE
2011-01-29 11:25:09 -08:00
ae9cc3d3f0
am d8c14af3: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'd8c14af3c7bfa9158953772be3447a9f26593e1c':
Import revised translations. DO NOT MERGE
2011-01-29 10:47:26 -08:00
599fb5f49b
am f4a4cc85: (-s ours) am 3b80e51f: (-s ours) am f7be630c: Import revised translations. DO NOT MERGE
...
* commit 'f4a4cc85920596bb15eeee002f9c8897358c2f2e':
Import revised translations. DO NOT MERGE
2011-01-29 09:18:18 -08:00
f4a4cc8592
am 3b80e51f: (-s ours) am f7be630c: Import revised translations. DO NOT MERGE
...
* commit '3b80e51fb7e2e4eae69a2de3ca6618a92e99afa1':
Import revised translations. DO NOT MERGE
2011-01-29 09:12:47 -08:00
a6fb82bbbf
am b6422e1e: (-s ours) am 4a2e6b38: (-s ours) am d8c14af3: Import revised translations. DO NOT MERGE
...
* commit 'b6422e1efb6064faa0204c49a1a11d05d8daece5':
Import revised translations. DO NOT MERGE
2011-01-29 08:38:19 -08:00
b6422e1efb
am 4a2e6b38: (-s ours) am d8c14af3: Import revised translations. DO NOT MERGE
...
* commit '4a2e6b38d994a2b800a8c8895e57e8f3858d8084':
Import revised translations. DO NOT MERGE
2011-01-29 08:02:41 -08:00
be9093426a
Fixing scrolling of all apps when below apps
...
Change-Id: Id6a4506ed18a02d31487ecff1d7309e7b3e25e9d
2011-01-28 18:09:40 -08:00
443926ff8c
am f0c9a05d: am e1dc51bc: Merge "Fix bug # 3370739 - wallpaper overscroll doesn\'t work with non-static wallpapers" into honeycomb
...
* commit 'f0c9a05d38c83e2bb3fb07f2ec649080f845f53e':
Fix bug # 3370739 - wallpaper overscroll doesn't work with non-static wallpapers
2011-01-28 16:24:14 -08:00
f0c9a05d38
am e1dc51bc: Merge "Fix bug # 3370739 - wallpaper overscroll doesn\'t work with non-static wallpapers" into honeycomb
...
* commit 'e1dc51bce0764ba5a567145b0f4c78aa5b24fe67':
Fix bug # 3370739 - wallpaper overscroll doesn't work with non-static wallpapers
2011-01-28 16:20:34 -08:00
e1dc51bce0
Merge "Fix bug # 3370739 - wallpaper overscroll doesn't work with non-static wallpapers" into honeycomb
2011-01-28 16:18:42 -08:00
09d6eb0f3f
Fix bug # 3370739 - wallpaper overscroll doesn't work with non-static wallpapers
2011-01-28 16:05:09 -08:00
249a1953c6
merge in honeycomb-release history after reset to honeycomb
2011-01-28 15:49:24 -08:00
0e755fd1ca
am 8217e7a7: (-s ours) am 0360e6f5: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '8217e7a7aca36acb7fcf960eeadbd3c84e26408c':
Import revised translations. DO NOT MERGE
2011-01-28 15:18:21 -08:00
8217e7a7ac
am 0360e6f5: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '0360e6f5ff06f34634246fa7ce38ad5e4e8222f4':
Import revised translations. DO NOT MERGE
2011-01-28 15:13:32 -08:00
0360e6f5ff
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-28 15:09:52 -08:00
067db58418
Import revised translations. DO NOT MERGE
...
Change-Id: Ib318009b98c186eddf2a47c01fa8fa78b71f5433
2011-01-28 14:57:42 -08:00
3b80e51fb7
am f7be630c: Import revised translations. DO NOT MERGE
...
* commit 'f7be630c94a9a5bfd8992d5b538f81a8e894b552':
Import revised translations. DO NOT MERGE
2011-01-28 14:16:15 -08:00
4a12b7f0ec
am 91ed3d47: am 7bfc9795: Clamping maximum overscroll amount
...
* commit '91ed3d47f2f2ac1f9dce9ed69a5968e4b9de24d2':
Clamping maximum overscroll amount
2011-01-28 14:05:41 -08:00
91ed3d47f2
am 7bfc9795: Clamping maximum overscroll amount
...
* commit '7bfc979594b083c36f6a08e49273ef7c9ad7b13a':
Clamping maximum overscroll amount
2011-01-28 14:03:18 -08:00
7bfc979594
Clamping maximum overscroll amount
...
- It was possible to crash launcher if you pulled really really far
to the right
Change-Id: I3ec45c7cbda2c4036e2e2359f2aa617ce7091bcd
2011-01-28 13:56:01 -08:00
f7be630c94
Import revised translations. DO NOT MERGE
...
Change-Id: I12478c849c20e9b243d6b6c559c10ac38382bef8
2011-01-28 13:20:57 -08:00
614282d4f0
merge in honeycomb-release history after reset to honeycomb
2011-01-28 07:25:23 -08:00
d271c0a011
am 1af432a1: am 860f4c5a: Final tweaks for home animations
...
* commit '1af432a1873b0b818e9613a26b0d5ce536f697a2':
Final tweaks for home animations
2011-01-27 20:32:17 -08:00
1af432a187
am 860f4c5a: Final tweaks for home animations
...
* commit '860f4c5a82d4b3c8d5444f986176a9af6f085df7':
Final tweaks for home animations
2011-01-27 20:30:44 -08:00
860f4c5a82
Final tweaks for home animations
...
Change-Id: I9a160a71fe22286077fe8601fb30a1a9bbe84da3
2011-01-27 20:16:13 -08:00
95ba4448cd
am 8f327e49: am 6e314086: Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)
...
* commit '8f327e49dea449878d1d8c1e5295bbbefe64b77a':
Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)
2011-01-27 18:29:02 -08:00
8f327e49de
am 6e314086: Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)
...
* commit '6e3140865d3f0def2e55934d8b0b2c1503386e54':
Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)
2011-01-27 18:26:29 -08:00
6e3140865d
Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)
...
Change-Id: I9df13c413ce62a2760ce6a8ebafed1e948088de2
2011-01-27 17:35:43 -08:00
396a09a3e5
am 063b343b: am 65af56cf: Merge "Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)" into honeycomb
...
* commit '063b343bebd189b8a95ac2e9e2dd6d30a8a343de':
Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)
2011-01-27 16:49:09 -08:00
063b343beb
am 65af56cf: Merge "Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)" into honeycomb
...
* commit '65af56cf9d8d63e10cf961e1468a5e86d4081405':
Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)
2011-01-27 16:47:39 -08:00
65af56cf9d
Merge "Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)" into honeycomb
2011-01-27 16:45:21 -08:00
0774aa6d31
am 6d8cb2b3: am b9522209: Merge "Tweaking parallax motion" into honeycomb
...
* commit '6d8cb2b3c863c7361750b3c594237ceb36a43dd9':
Tweaking parallax motion
2011-01-27 16:39:53 -08:00
b379ef8329
am c1f4c7d3: am 23ec9a1f: Merge "Fixing issue with items not being removed from the homescreen. (3392097)" into honeycomb
...
* commit 'c1f4c7d36f61a9a6711ffef2181272aad196538f':
Fixing issue with items not being removed from the homescreen. (3392097)
2011-01-27 16:37:58 -08:00
6d8cb2b3c8
am b9522209: Merge "Tweaking parallax motion" into honeycomb
...
* commit 'b9522209d385f0ae6bfcf2e5ce8592f5ea116ffe':
Tweaking parallax motion
2011-01-27 16:37:17 -08:00
c1f4c7d36f
am 23ec9a1f: Merge "Fixing issue with items not being removed from the homescreen. (3392097)" into honeycomb
...
* commit '23ec9a1f2b462b32dc27aca829f97331dfafe13e':
Fixing issue with items not being removed from the homescreen. (3392097)
2011-01-27 16:35:22 -08:00
Michael Jurka
Winson Chung
The Android Automerger
The Android Open Source Project
Eric Fischer
Adam Cohen