Dan Egnor
29bff34cce
Merge "Remove old EventLog tests from here, they will be replaced by a (better) EventLog test in CTS."
2010-01-07 09:42:57 -08:00
Doug Zongker
74a5c34802
Merge "move Watchdog's settings from Gservices to Secure"
2010-01-07 09:24:01 -08:00
Xavier Ducrohet
4b83794c88
am de0ef181: am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
...
Merge commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c'
* commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c':
Move Layoutlib API library to sdk.git
2010-01-07 09:22:16 -08:00
Jaikumar Ganesh
2133a9f10b
am 2790b20c: am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
...
Merge commit '2790b20c537b33dbf366436f6d27776148ded490'
* commit '2790b20c537b33dbf366436f6d27776148ded490':
Fix media option settings for A2DP.
2010-01-07 09:22:04 -08:00
Dianne Hackborn
a0c910153d
am ce56857e: am cb2d50d0: Fix issue #2357259 : aapt tool prints "uses-configuation:"
...
Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9'
* commit 'ce56857ef72538c197afd91b9f30dc868d2667d9':
Fix issue #2357259 : aapt tool prints "uses-configuation:"
2010-01-07 09:21:52 -08:00
Ying Wang
45c4ad922c
am 80410b55: am 42c98ada: Still use ro.monkey
...
Merge commit '80410b55f1eccf345fb6a01ca9a277935ac4098f'
* commit '80410b55f1eccf345fb6a01ca9a277935ac4098f':
Still use ro.monkey
2010-01-07 09:21:40 -08:00
Tom O'Neill
b9d770c8f4
Merge "Update Notepad tutorial documentation to match code"
2010-01-07 09:18:55 -08:00
Xavier Ducrohet
05cba4c4b7
am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
...
Merge commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e' into eclair-plus-aosp
* commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e':
Move Layoutlib API library to sdk.git
2010-01-07 09:16:32 -08:00
Xavier Ducrohet
421b581977
Merge "Move Layoutlib API library to sdk.git" into eclair
2010-01-07 09:08:06 -08:00
Leon Scroggins
5988ae3b2c
am bd6029fc: am 3a503399: Request <label> info only when accessing a textfield.
...
Merge commit 'bd6029fc5171e1094a00cdecb3f33aae6fe69c9f'
* commit 'bd6029fc5171e1094a00cdecb3f33aae6fe69c9f':
Request <label> info only when accessing a textfield.
2010-01-07 06:00:17 -08:00
Leon Scroggins
891229c1bf
am 3a503399: Request <label> info only when accessing a textfield.
...
Merge commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9' into eclair-mr2-plus-aosp
* commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9':
Request <label> info only when accessing a textfield.
2010-01-07 05:46:19 -08:00
Bjorn Bringert
d4621042d5
Merge "Get correct density info when using resource URIs in ImageView"
2010-01-07 02:21:58 -08:00
Mike Lockwood
8c493bb829
Merge "Fix broken Javadoc link."
2010-01-06 20:17:10 -08:00
Mike Lockwood
9115d11b80
Merge "Add LocationManagerImpl class to act as a public wrapper for the ILocationProvider interface"
2010-01-06 19:43:42 -08:00
Romain Guy
09681c2ce1
Merge "Fix two ListView bugs related to onAttachedToWindow/onDetachedFromWindow. Bug: #2359368."
2010-01-06 18:50:53 -08:00
James Dong
72bb4839ef
Merge "Add MPEG to the file extensions that scanner cares"
2010-01-06 17:26:01 -08:00
Jason Sams
2f6f1206a6
Merge "Support npot on es 2.0 HW."
2010-01-06 17:25:32 -08:00
Oscar Montemayor
8dbcdd84b2
Merge "Apps on SD card project. A simple keystore to store system-only key material, by leveraging file system access permissions."
2010-01-06 17:09:33 -08:00
San Mehat
7d0930f25a
Merge "PowerManagerService: When rebooting, ensure external storage is unmounted"
2010-01-06 16:45:52 -08:00
Doug Zongker
bbbe67b297
Merge "add ACCESS_CACHE_FILESYSTEM permission to core manifest"
2010-01-06 16:02:46 -08:00
San Mehat
c11d7a6a07
Merge "framework: MountService: Add initial support for Android Secure External Caches"
2010-01-06 14:30:56 -08:00
Dan Egnor
eb9685ef47
Merge "Fix SDK build problem until EventLog is published."
2010-01-06 14:15:53 -08:00
Joe Onorato
9df1115e5e
Merge "Stop spamming the log."
2010-01-06 14:10:33 -08:00
Cary Clark
7c127abd27
am 9e5f3ec9: am e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2
...
Merge commit '9e5f3ec97d468702aa3f3a59e94009e807715189'
* commit '9e5f3ec97d468702aa3f3a59e94009e807715189':
set nine patch padding initially to an empty rectangle
2010-01-06 14:05:58 -08:00
Leon Scroggins
59909e8789
am fbd3afb1: am e38fc189: Show label information as hint text
...
Merge commit 'fbd3afb1801ed69a5c948241e68b997be3d84f4e'
* commit 'fbd3afb1801ed69a5c948241e68b997be3d84f4e':
Show label information as hint text
2010-01-06 14:05:46 -08:00
Jaikumar Ganesh
ed371412fe
am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
...
Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp
* commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
Fix media option settings for A2DP.
2010-01-06 13:46:59 -08:00
Dianne Hackborn
4dcc8cb91b
am cb2d50d0: Fix issue #2357259 : aapt tool prints "uses-configuation:"
...
Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp
* commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8':
Fix issue #2357259 : aapt tool prints "uses-configuation:"
2010-01-06 13:46:50 -08:00
Ying Wang
ea915a14f2
am 42c98ada: Still use ro.monkey
...
Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp
* commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534':
Still use ro.monkey
2010-01-06 13:46:36 -08:00
Cary Clark
1500de3ffc
am e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2
...
Merge commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda' into eclair-mr2-plus-aosp
* commit 'e3bbaf6c4f51f8201922cae29daa7e46f6c43bda':
set nine patch padding initially to an empty rectangle
2010-01-06 13:45:59 -08:00
Leon Scroggins
beb38fd618
am e38fc189: Show label information as hint text
...
Merge commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198' into eclair-mr2-plus-aosp
* commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198':
Show label information as hint text
2010-01-06 13:45:46 -08:00
Jaikumar Ganesh
d83e098bf9
Merge "Fix media option settings for A2DP." into eclair
2010-01-06 13:38:27 -08:00
Maryam Garrett
7f5f0f1311
Merge "Enable onepointfivetap-and-swipe to select."
2010-01-06 12:51:48 -08:00
Dan Egnor
29fd34dc8b
Merge "Simplify EventLog interface -- remove supported for nested sequences (which nobody used) and streamline the API, adding documentation in preparation for inclusion in the SDK."
2010-01-06 12:49:43 -08:00
Bjorn Bringert
c3d8372456
Merge "Add RemoteViews.setBundle() method."
2010-01-06 12:48:02 -08:00
Cary Clark
54258c5b8b
Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2
2010-01-06 09:52:54 -08:00
Jean-Baptiste Queru
837edec5e3
Do not use a user tag on apps, as it is ignored.
...
The build system does not honor user tags on apps,
and setting it is misleading.
This removes the confusion by making the makefiles
behave like they read.
Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885
2010-01-06 08:53:44 -08:00
Marco Nelissen
4b059669c0
Merge "Remove the drawables for the VerticalTextSpinner, since they're no longer needed here."
2010-01-06 07:39:48 -08:00
Mike Lockwood
b55cf3c793
Merge "Cleanup and add public wrapper for IGeocodeProvider interface to prepare for network location unbundling."
2010-01-06 07:08:56 -08:00
Adam Powell
209f92fc54
Merge "Don't perform ListView click events for INVALID_POSITION. Addresses bug 2329294"
2010-01-05 17:38:20 -08:00
Elliott Hughes
3afd73929b
Merge "Stop preloading a class I'm about to remove."
2010-01-05 15:08:10 -08:00
Marco Nelissen
ffa17f0ea2
Merge "VerticalTextSpinner has been moved in to the music app, and is no longer needed here."
2010-01-05 14:43:47 -08:00
Amith Yamasani
e5ce85e981
Merge "Fix for 2345922: Press and hold space in ?123 mode will give ....."
2010-01-05 14:17:47 -08:00
Andreas Huber
7f7587b183
Merge "Quick and dirty implementation to follow http redirects in stagefright."
2010-01-05 13:46:20 -08:00
Scott Main
361fb12ad8
am 95eeedfe: am c20467f9: docs: update the device dashboard
...
Merge commit '95eeedfe8dc24db7a981ef69f94d307548d020fa'
* commit '95eeedfe8dc24db7a981ef69f94d307548d020fa':
docs: update the device dashboard
2010-01-05 12:34:14 -08:00
Scott Main
030910f5d5
am c20467f9: docs: update the device dashboard
...
Merge commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0' into eclair-plus-aosp
* commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0':
docs: update the device dashboard
2010-01-05 12:31:06 -08:00
Jean-Baptiste Queru
c782c271e3
Merge "explicit set an "optional" tag"
2010-01-05 12:06:43 -08:00
Wink Saville
e0ccaf2717
Merge "Fix data connection support on emulator."
2010-01-05 11:47:44 -08:00
Grace Kloba
0d026a97bb
am 552346a7: am 106f9b24: Patch from Huahui Wu.
...
Merge commit '552346a743be7c8b10893f817238e92938866999'
* commit '552346a743be7c8b10893f817238e92938866999':
Patch from Huahui Wu.
2010-01-05 11:32:52 -08:00
Andreas Huber
b644577d93
Merge "Protect against possible temporary objects going away before we get at their data."
2010-01-05 11:28:58 -08:00
Grace Kloba
55a16867b0
am 106f9b24: Patch from Huahui Wu.
...
Merge commit '106f9b244633171ab75dd98b9761b7137c1a4705' into eclair-mr2-plus-aosp
* commit '106f9b244633171ab75dd98b9761b7137c1a4705':
Patch from Huahui Wu.
2010-01-05 11:20:18 -08:00