The Android Automerger
fc8c15e52f
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-03-21 07:47:57 -07:00
The Android Automerger
42e05afacc
merge in gingerbread-release history after reset to gingerbread
2011-03-21 05:42:44 -07:00
The Android Automerger
1c5beb058e
merge in gingerbread-release history after reset to gingerbread
2011-03-18 17:35:46 -07:00
Eric Fischer
b3bcd60f95
am 04d181dd: (-s ours) am b879135b: (-s ours) am 9d8285fa: Import revised translations. DO NOT MERGE
...
* commit '04d181ddd0a29acfffc19094711afce5fac3a18d':
Import revised translations. DO NOT MERGE
2011-03-18 16:58:47 -07:00
Eric Fischer
04d181ddd0
am b879135b: (-s ours) am 9d8285fa: Import revised translations. DO NOT MERGE
...
* commit 'b879135b9b4b0ba5f2496effe80b3f04f83740e5':
Import revised translations. DO NOT MERGE
2011-03-18 16:54:07 -07:00
Eric Fischer
b879135b9b
am 9d8285fa: Import revised translations. DO NOT MERGE
...
* commit '9d8285fa61f2d61166cb8d34b0be84731d8605b8':
Import revised translations. DO NOT MERGE
2011-03-18 16:10:05 -07:00
Winson Chung
538c265f66
Merge "Fixing crash where we were assuming an old parent hierarchy."
2011-03-18 16:08:36 -07:00
Winson Chung
7a1d16555d
Fixing crash where we were assuming an old parent hierarchy.
...
Change-Id: I5acccab175c150f2fb994e58f0b5592d2015fcfe
2011-03-18 15:56:43 -07:00
Eric Fischer
9d8285fa61
Import revised translations. DO NOT MERGE
...
Change-Id: I68e6def231a4c2c14f898ca26837fda0ee31d316
2011-03-18 15:15:34 -07:00
Winson Chung
f1883646e0
Merge "Fixing an issue where other pages were taking on the min width of the widget page."
2011-03-18 11:50:16 -07:00
Winson Chung
34b23d5c8c
Fixing an issue where other pages were taking on the min width of the widget page.
...
Change-Id: I256d2dc918ca8760ee58c9cb430dd1c49c5ceea0
2011-03-18 11:32:26 -07:00
The Android Automerger
2ffec91d5d
merge in gingerbread-release history after reset to gingerbread
2011-03-18 10:42:06 -07:00
The Android Automerger
97e7ba7578
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-03-18 07:25:56 -07:00
Eric Fischer
d40fcd387d
Import revised translations.
...
Change-Id: I95d7238d53252aa3dcb5cbae693e97b8c2670265
2011-03-17 16:54:10 -07:00
The Android Automerger
de2e5bc5e7
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-03-17 07:25:34 -07:00
The Android Automerger
945c535eeb
merge in gingerbread-release history after reset to gingerbread
2011-03-17 05:44:06 -07:00
Eric Fischer
ac5f8b75ec
am 8558c403: (-s ours) am 78201405: Import revised translations. DO NOT MERGE
...
* commit '8558c4030f12e48f407154fd490e55571c3702c4':
Import revised translations. DO NOT MERGE
2011-03-16 11:00:37 -07:00
Eric Fischer
8558c4030f
am 78201405: Import revised translations. DO NOT MERGE
...
* commit '78201405cb2fdaf5a52f83ca99ecd8bb711f087d':
Import revised translations. DO NOT MERGE
2011-03-16 10:52:04 -07:00
Eric Fischer
78201405cb
Import revised translations. DO NOT MERGE
...
Change-Id: I8ac97fe500e63576d895b636160f47219f8a3225
2011-03-16 10:13:54 -07:00
The Android Automerger
27f8098a0e
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-03-16 07:24:02 -07:00
The Android Automerger
85786c688b
merge in gingerbread-release history after reset to gingerbread
2011-03-16 05:43:58 -07:00
Eric Fischer
d277fd7bc4
am 613fe272: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '613fe272d894ca9b00aa4658a8863839b42b53ce':
Import revised translations. DO NOT MERGE
2011-03-15 23:26:53 -07:00
Eric Fischer
613fe272d8
Import revised translations. DO NOT MERGE
...
Change-Id: I6d39829589a4e7ccbdb6f429a8c8b50dc2c6197c
2011-03-15 23:11:14 -07:00
Patrick Dubroy
d4de8530b9
Fix 4093841: Launcher crash after downloading app & hitting back
...
The last change to fix the "blue glow gone wild" re-introduced a NPE
caused by setting the pressed state of a BubbleTextView which has
been detached.
Change-Id: I726bace77dd04b6ac8f3e170dd9e1df00a183384
2011-03-15 14:55:11 -07:00
Eric Fischer
b0f7f80c29
Merge "Import revised translations."
2011-03-15 11:58:52 -07:00
Patrick Dubroy
40523ceefd
am 166e99ee: am d69e1138: Fix 4093841: Launcher crash after downloading app & hitting back
...
* commit '166e99ee68d59c689d473d736464d3a096185d77':
Fix 4093841: Launcher crash after downloading app & hitting back
2011-03-15 10:46:59 -07:00
Patrick Dubroy
45e57862d7
am dcba2081: (-s ours) Fix 4081795: Blue glow gone wild. DO NOT MERGE
...
* commit 'dcba2081c6f39a6d334e26caafc783b36b34a95a':
Fix 4081795: Blue glow gone wild. DO NOT MERGE
2011-03-15 10:46:57 -07:00
Eric Fischer
3b0841da08
Import revised translations.
...
Change-Id: Ic8cfb7f36b9f89fbc131af8a92c32483db2a4698
2011-03-15 10:44:05 -07:00
Patrick Dubroy
166e99ee68
am d69e1138: Fix 4093841: Launcher crash after downloading app & hitting back
...
* commit 'd69e11384c9eefe49039b198edcece5d59c8868f':
Fix 4093841: Launcher crash after downloading app & hitting back
2011-03-15 10:39:54 -07:00
Patrick Dubroy
d69e11384c
Fix 4093841: Launcher crash after downloading app & hitting back
...
The last change to fix the "blue glow gone wild" re-introduced a NPE
caused by setting the pressed state of a BubbleTextView which has
been detached.
Change-Id: I726bace77dd04b6ac8f3e170dd9e1df00a183384
2011-03-15 10:29:01 -07:00
The Android Automerger
aa812972c0
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-03-15 07:25:34 -07:00
The Android Automerger
fe99cffbc1
merge in gingerbread-release history after reset to gingerbread
2011-03-14 22:34:01 -07:00
Patrick Dubroy
f2a6cbf039
am f0e9072f: (-s ours) am 3499d8c8: (-s ours) Fix 4081795: Blue glow gone wild. DO NOT MERGE
...
* commit 'f0e9072f8ed85a97c461b73c7a0df1622cba4001':
Fix 4081795: Blue glow gone wild. DO NOT MERGE
2011-03-14 17:43:57 -07:00
Patrick Dubroy
dcba2081c6
Fix 4081795: Blue glow gone wild. DO NOT MERGE
...
Change-Id: I9038ed322811987e69045602f438cdf2bbd946e9
2011-03-14 17:41:14 -07:00
Patrick Dubroy
f0e9072f8e
am 3499d8c8: (-s ours) Fix 4081795: Blue glow gone wild. DO NOT MERGE
...
* commit '3499d8c89d6b5989579880bf80df31df46483304':
Fix 4081795: Blue glow gone wild. DO NOT MERGE
2011-03-14 17:36:54 -07:00
Michael Jurka
bdfa16dcf7
Merge "refactoring "All Apps" layout into one layout"
2011-03-14 16:12:02 -07:00
Michael Jurka
59eae99140
refactoring "All Apps" layout into one layout
2011-03-14 16:03:47 -07:00
Eric Fischer
5dc580e111
am 7684e175: (-s ours) am ec4ff677: (-s ours) Import revised translations. DO NOT MERGE
...
* commit '7684e175653ff2cfff4c0ba94ce328982b996d2b':
Import revised translations. DO NOT MERGE
2011-03-14 15:19:25 -07:00
Patrick Dubroy
3499d8c89d
Fix 4081795: Blue glow gone wild. DO NOT MERGE
...
Change-Id: I9038ed322811987e69045602f438cdf2bbd946e9
2011-03-14 14:50:01 -07:00
Eric Fischer
7684e17565
am ec4ff677: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'ec4ff67723df00e2641b5d77b486518234217c0b':
Import revised translations. DO NOT MERGE
2011-03-14 14:32:04 -07:00
Eric Fischer
ec4ff67723
Import revised translations. DO NOT MERGE
...
Change-Id: I6d39829589a4e7ccbdb6f429a8c8b50dc2c6197c
2011-03-14 14:06:46 -07:00
Adam Cohen
6921664f48
Merge "Fixing widget resize visual / ux ugliness, Bug: 4082591"
2011-03-14 13:30:59 -07:00
Adam Cohen
6788269814
Fixing widget resize visual / ux ugliness, Bug: 4082591
...
Change-Id: Ib258e02f52dd83418db0c0249efdc90d2424f059
2011-03-14 12:16:52 -07:00
Patrick Dubroy
96864c3c27
Fix 4081795: Blue glow gone wild
...
Change-Id: Ib5d4a63d0eb53f498e1fd4fcf733fda22be8f894
2011-03-14 10:39:11 -07:00
The Android Automerger
c7a5ef2b14
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-03-14 07:25:26 -07:00
The Android Automerger
08c34a3af3
merge in gingerbread-release history after reset to gingerbread
2011-03-12 11:56:25 -08:00
The Android Automerger
f82391aa03
merge in gingerbread-release history after reset to gingerbread
2011-03-11 10:35:46 -08:00
The Android Automerger
7d418da4d3
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
2011-03-11 07:26:19 -08:00
Kenny Root
6deba4aebc
Applications with broken resources get default icon
...
This will prevent the Launcher from crashing when the icon resource is
not found.
Bug: 4016288
Change-Id: I152574eb62cff66fa863152f84d4bb201f0341af
2011-03-10 17:18:08 -08:00
Adam Cohen
5a0d66c36e
am 7700a764: Merge "Fixing workspace scrolling, Bug: 4070816" into honeycomb-mr1
...
* commit '7700a7648ad1073d4f1f1afd94bf554732edf49b':
Fixing workspace scrolling, Bug: 4070816
2011-03-10 13:55:14 -08:00