Mike Cleron
68ac73e69b
am 1492b96e: am fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
...
Merge commit '1492b96eb178631b816bdb253a1b6d1df8133e13'
* commit '1492b96eb178631b816bdb253a1b6d1df8133e13':
Remove obsolete links; start at a method to turn on fading scrollbars
2009-09-29 11:09:35 -07:00
Wu-cheng Li
dfc1cb1cdf
am 90b4a932: am fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
...
Merge commit '90b4a93271520b2952b55520338b153192b834a6'
* commit '90b4a93271520b2952b55520338b153192b834a6':
Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
2009-09-29 11:09:04 -07:00
Xavier Ducrohet
f0aa856687
am 25c70dd9: am 279ba943: Merge change I7c7b1596 into eclair
...
Merge commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586'
* commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586':
Fix a warning output.
2009-09-29 11:08:32 -07:00
Romain Guy
4f588a959d
am ba016786: am b4c547a5: Fix possible NPE in AbsListView.positionSelector().
...
Merge commit 'ba0167861d71b0412503843369530575f0d9faeb'
* commit 'ba0167861d71b0412503843369530575f0d9faeb':
Fix possible NPE in AbsListView.positionSelector().
2009-09-29 11:08:25 -07:00
Nick Pelly
ef41532861
am 3083a3c1: am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
...
Merge commit '3083a3c11ae303e3fc17d9c7949a46b1e619c146'
* commit '3083a3c11ae303e3fc17d9c7949a46b1e619c146':
Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
2009-09-29 11:07:30 -07:00
Bjorn Bringert
b525a9e784
am 575d73a1: am 2dfa6edc: Merge change Ida50e915 into eclair
...
Merge commit '575d73a15b33b000feb82f5243c6d9bec7e16083'
* commit '575d73a15b33b000feb82f5243c6d9bec7e16083':
Pass limit=50 to all suggestion sources.
2009-09-29 11:06:45 -07:00
Joshua Bloch
e72ec09699
Replace existing ArrayList implementation with faster, simpler one.
2009-09-28 17:05:08 -07:00
Mike Cleron
1492b96eb1
am fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
...
Merge commit 'fe81d386a818b386ffc0d5a789236531ab4e264f' into eclair-plus-aosp
* commit 'fe81d386a818b386ffc0d5a789236531ab4e264f':
Remove obsolete links; start at a method to turn on fading scrollbars
2009-09-28 14:41:46 -07:00
Mike Cleron
fe81d386a8
Remove obsolete links; start at a method to turn on fading scrollbars
2009-09-28 14:34:14 -07:00
Wu-cheng Li
90b4a93271
am fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
...
Merge commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b' into eclair-plus-aosp
* commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b':
Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
2009-09-28 14:13:11 -07:00
Xavier Ducrohet
25c70dd9a1
am 279ba943: Merge change I7c7b1596 into eclair
...
Merge commit '279ba943553ec2368d14e1b3c8a88c36bf17785d' into eclair-plus-aosp
* commit '279ba943553ec2368d14e1b3c8a88c36bf17785d':
Fix a warning output.
2009-09-28 13:55:36 -07:00
Romain Guy
ba0167861d
am b4c547a5: Fix possible NPE in AbsListView.positionSelector().
...
Merge commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f' into eclair-plus-aosp
* commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f':
Fix possible NPE in AbsListView.positionSelector().
2009-09-28 13:55:30 -07:00
Wu-cheng Li
fe1a86df8b
Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
2009-09-28 13:51:59 -07:00
Android (Google) Code Review
279ba94355
Merge change I7c7b1596 into eclair
...
* changes:
Fix a warning output.
2009-09-28 16:49:16 -04:00
Romain Guy
b4c547a56c
Fix possible NPE in AbsListView.positionSelector().
...
ListView was being reckless and calling the method with a null object in some
situations.
Change-Id: Ibb595a1ff6f916c699e4af55450966dd7fd8c156
2009-09-28 13:45:00 -07:00
Nick Pelly
3083a3c11a
am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
...
Merge commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10' into eclair-plus-aosp
* commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10':
Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
2009-09-28 13:19:15 -07:00
Nick Pelly
aef439e6f8
Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
...
Change-Id: I564429d5c5b6a5372b6ff26a53b0d7e518b53631
2009-09-28 13:06:22 -07:00
Xavier Ducrohet
f18ccc13a6
Fix a warning output.
...
This was introduced by the dpi work.
Change-Id: I7c7b1596085f70532b8279139c287a2a58f57046
2009-09-28 12:59:33 -07:00
Bjorn Bringert
575d73a15b
am 2dfa6edc: Merge change Ida50e915 into eclair
...
Merge commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc' into eclair-plus-aosp
* commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc':
Pass limit=50 to all suggestion sources.
2009-09-28 12:54:37 -07:00
Android (Google) Code Review
2dfa6edcd0
Merge change Ida50e915 into eclair
...
* changes:
Pass limit=50 to all suggestion sources.
2009-09-28 15:47:56 -04:00
Bjorn Bringert
3fc7c67de1
Pass limit=50 to all suggestion sources.
...
Should mitigate http://b/issue?id=2149158
"Bad suggestions behavior within contacts app
search for 10k contact db"
Change-Id: Ida50e9157c3ce46fc7892ef09a67da9f4008e665
2009-09-28 20:32:13 +01:00
Bjorn Bringert
bd48a3165f
am 385a39d3: am 9d686c93: Merge change 27474 into eclair
...
Merge commit '385a39d322267890edc0708c1baff7ac4125ed31'
* commit '385a39d322267890edc0708c1baff7ac4125ed31':
Don't crash search when getKeyDispatcherState() is null
2009-09-28 11:54:19 -07:00
Mike Cleron
6af6edf5b5
am 1ca9b13b: am 3ecd58c6: Fix build
...
Merge commit '1ca9b13bf4b0b95c1beeb11732e3f2af376551e9'
* commit '1ca9b13bf4b0b95c1beeb11732e3f2af376551e9':
Fix build
2009-09-28 11:54:09 -07:00
Evan Millar
551ac8aaf7
am 93d0b335: am 14f65ff9: Merge change 27243 into eclair
...
Merge commit '93d0b335a65149b1dc3c31cda89c076e6360c6f8'
* commit '93d0b335a65149b1dc3c31cda89c076e6360c6f8':
Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 11:54:02 -07:00
James Dong
d4a9711057
am 9365c8fa: am 99638e74: Merge change 27466 into eclair
...
Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'
* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:53:55 -07:00
Bjorn Bringert
385a39d322
am 9d686c93: Merge change 27474 into eclair
...
Merge commit '9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp
* commit '9d686c9384cad2bccb3db27eb19bb089bf05041c':
Don't crash search when getKeyDispatcherState() is null
2009-09-28 11:49:43 -07:00
Mike Cleron
1ca9b13bf4
am 3ecd58c6: Fix build
...
Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp
* commit '3ecd58c650371206008efd687933c370e4e28a34':
Fix build
2009-09-28 11:49:36 -07:00
Evan Millar
93d0b335a6
am 14f65ff9: Merge change 27243 into eclair
...
Merge commit '14f65ff9451747d6bb802e1b754afae1110ad759' into eclair-plus-aosp
* commit '14f65ff9451747d6bb802e1b754afae1110ad759':
Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 11:49:29 -07:00
James Dong
9365c8fa7c
am 99638e74: Merge change 27466 into eclair
...
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp
* commit '99638e747251929191f7773d2a81bbea223f1e09':
Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:49:22 -07:00
Android (Google) Code Review
9d686c9384
Merge change 27474 into eclair
...
* changes:
Don't crash search when getKeyDispatcherState() is null
2009-09-28 14:46:43 -04:00
Android (Google) Code Review
14f65ff945
Merge change 27243 into eclair
...
* changes:
Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 14:44:42 -04:00
Mike Cleron
3ecd58c650
Fix build
2009-09-28 11:44:36 -07:00
Android (Google) Code Review
99638e7472
Merge change 27466 into eclair
...
* changes:
Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 14:40:34 -04:00
Bjorn Bringert
5b6b41241d
Don't crash search when getKeyDispatcherState() is null
...
Fixes http://b/editIssue?id=2150672
Change-Id: I6fb87c1a59b4b3a945822932047a66c4116e6391
2009-09-28 19:37:29 +01:00
Amith Yamasani
b0ee99fd15
am e086e1d1: am fedb3269: Merge change 27349 into eclair
...
Merge commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f'
* commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f':
Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:22:43 -07:00
Nick Pelly
d4312b1ffc
am 75ce6b10: am 96e42b3a: Merge change 27462 into eclair
...
Merge commit '75ce6b103810efbc61af4b786651d9cc414107fd'
* commit '75ce6b103810efbc61af4b786651d9cc414107fd':
Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:22:35 -07:00
Amith Yamasani
e086e1d177
am fedb3269: Merge change 27349 into eclair
...
Merge commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f' into eclair-plus-aosp
* commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f':
Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:16:53 -07:00
Nick Pelly
75ce6b1038
am 96e42b3a: Merge change 27462 into eclair
...
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp
* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:16:45 -07:00
Mike Cleron
b4e5dc1518
am 91d53844: am f116bf88: Fading scrollbars return. But you have to opt in.
...
Merge commit '91d538447029330921e0d960f8616aac1929fb66'
* commit '91d538447029330921e0d960f8616aac1929fb66':
Fading scrollbars return. But you have to opt in.
2009-09-28 11:16:42 -07:00
Android (Google) Code Review
fedb32696a
Merge change 27349 into eclair
...
* changes:
Fix 2143297: Fix transition from password -> visible password
2009-09-28 14:12:03 -04:00
Android (Google) Code Review
96e42b3a54
Merge change 27462 into eclair
...
* changes:
Add an API to request a system activity to turn on Bluetooth.
2009-09-28 14:09:47 -04:00
Amith Yamasani
a8c0edb8fb
Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:08:57 -07:00
Mike Cleron
91d5384470
am f116bf88: Fading scrollbars return. But you have to opt in.
...
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp
* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
Fading scrollbars return. But you have to opt in.
2009-09-28 11:07:14 -07:00
Nick Pelly
1acdcc1a50
Add an API to request a system activity to turn on Bluetooth.
...
Change-Id: I2fca33ad27017ea4e2ecba37854b749682d07672
2009-09-28 11:04:00 -07:00
James Dong
525ad18663
Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 10:57:17 -07:00
Andrei Popescu
742420d073
am c2ae2865: am 5d062bc3: Merge change 27426 into eclair
...
Merge commit 'c2ae2865138e8a42d49abd17542981b33a044ed4'
* commit 'c2ae2865138e8a42d49abd17542981b33a044ed4':
Handle the case where GoogleLocationSettingObserver::onChange
2009-09-28 10:51:51 -07:00
Mike Cleron
f116bf8884
Fading scrollbars return. But you have to opt in.
2009-09-28 10:47:04 -07:00
Andrei Popescu
c2ae286513
am 5d062bc3: Merge change 27426 into eclair
...
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp
* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
Handle the case where GoogleLocationSettingObserver::onChange
2009-09-28 10:42:13 -07:00
Android (Google) Code Review
5d062bc3de
Merge change 27426 into eclair
...
* changes:
Handle the case where GoogleLocationSettingObserver::onChange is called after GoogleLocationSettingObserver::doNotObserve().
2009-09-28 13:33:01 -04:00
Grace Kloba
06f54af0b9
am 963cd288: am 0d03b914: Before we send VIEW_SIZE_CHANGED after first layout, we should remove VIEW_SIZE_CHANGED in the queue if there is any as we are going to send the message in the front of the queue.
...
Merge commit '963cd288a5bef260d06fbfd096e6f02793b83532'
* commit '963cd288a5bef260d06fbfd096e6f02793b83532':
Before we send VIEW_SIZE_CHANGED after first layout,
2009-09-28 10:21:34 -07:00