Dirk Dougherty
d71c2aa1a3
Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
2010-01-07 12:30:14 -08:00
Dirk Dougherty
4e7db25687
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
...
Bug: 2160782
Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
2010-01-07 12:05:01 -08:00
Erik
bd8e2e20a9
b/2358627 and b/2293263 Fixed eventDay bugs.
...
Changed query so that all days an event occurs on can be marked. Also
fixes index out of bounds error.
2010-01-07 11:56:46 -08:00
San Mehat
9f7f7cad0b
ShutdownThread: Shutdown MountService before lowlevel shutdown
...
Signed-off-by: San Mehat <san@google.com>
2010-01-07 11:36:22 -08:00
San Mehat
dde2539798
MountService: Remove ACTION_SHUTDOWN handler
...
Shutdown handlers run too early for unmounting, so don't handle it.
Shutdown will be called explicitly from the ShutdownThread
Signed-off-by: San Mehat <san@google.com>
2010-01-07 11:36:22 -08:00
San Mehat
1b780a0190
Merge "PowerManagerService: Switch to using MountService shutdown for media"
2010-01-07 11:35:29 -08:00
San Mehat
9e6f148347
Merge "MountService: Add an ACTION_SHUTDOWN handler and export a method for external shutdown"
2010-01-07 11:35:23 -08:00
San Mehat
1e512790bf
PowerManagerService: Switch to using MountService shutdown for media
...
Signed-off-by: San Mehat <san@google.com>
2010-01-07 10:40:29 -08:00
San Mehat
91c7761139
MountService: Add an ACTION_SHUTDOWN handler and export a method for external shutdown
...
Signed-off-by: San Mehat <san@google.com>
2010-01-07 10:39:41 -08:00
Scott Main
0a49913c81
am 707ca41d: am d8858893: Merge "docs: fix some broken links" into eclair
...
Merge commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb'
* commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb':
docs: fix some broken links
2010-01-07 10:26:49 -08:00
Scott Main
707ca41d1f
am d8858893: Merge "docs: fix some broken links" into eclair
...
Merge commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp
* commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1':
docs: fix some broken links
2010-01-07 10:21:52 -08:00
Cary Clark
2110bb024e
am affa5d2c: remove unused jni interfaces
...
Merge commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp
* commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117':
remove unused jni interfaces
2010-01-07 10:19:56 -08:00
Scott Main
d88588935e
Merge "docs: fix some broken links" into eclair
2010-01-07 10:18:45 -08:00
Cary Clark
affa5d2c0f
remove unused jni interfaces
...
Also make package interfaces unused outside of WebView.java
private.
companion change in external/webkit
2010-01-07 13:02:42 -05:00
Dan Egnor
a88025d086
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
914d6597d2
Merge "move Watchdog's settings from Gservices to Secure"
2010-01-07 09:24:01 -08:00
Xavier Ducrohet
f80a762400
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
1ee5ceb92d
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
93cee56d87
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
1060147d5c
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
2e4ce0fc6d
Merge "Update Notepad tutorial documentation to match code"
2010-01-07 09:18:55 -08:00
Xavier Ducrohet
de0ef18151
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
ce60d4b27e
Merge "Move Layoutlib API library to sdk.git" into eclair
2010-01-07 09:08:06 -08:00
Xavier Ducrohet
82935938fa
Move Layoutlib API library to sdk.git
...
Change-Id: I53f1c5d52447b6215ae7a6f2f1f82d0879e952ca
2010-01-07 08:57:32 -08:00
San Mehat
1a8eec69e1
MountListener: Improve error logging
...
Signed-off-by: San Mehat <san@google.com>
2010-01-07 08:06:10 -08:00
Leon Scroggins
283ae234a7
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
bd6029fc51
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
Leon Scroggins
3a5033996e
Request <label> info only when accessing a textfield.
...
Previously, we were storing the label info each time we build the
navigation cache.
Requires a change to external/webkit.
2010-01-07 08:33:34 -05:00
Bjorn Bringert
1b4a031954
Merge "Get correct density info when using resource URIs in ImageView"
2010-01-07 02:21:58 -08:00
Dan Egnor
6916089e83
Remove old EventLog tests from here, they will be replaced by a
...
(better) EventLog test in CTS.
Fix some minor errors in the handling of too-large event log values.
2010-01-07 00:28:58 -08:00
Mike Lockwood
4cd9f5454a
Merge "Fix broken Javadoc link."
2010-01-06 20:17:10 -08:00
Mike Lockwood
be5ed378d9
Fix broken Javadoc link.
...
Change-Id: Ia72dc3dccf95f95c6847eb52d8b210ed774a804b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-06 23:15:33 -05:00
Mike Lockwood
8dcb601c1f
Merge "Add LocationManagerImpl class to act as a public wrapper for the ILocationProvider interface"
2010-01-06 19:43:42 -08:00
Mike Lockwood
9d2f7a7d66
Add LocationManagerImpl class to act as a public wrapper for the ILocationProvider interface
...
Location providers implemented outside of the core android platform (like network location)
can subclass LocationManagerImpl to implement the location provider interface
without being bound too tightly to the location manager internals.
Change-Id: Id193d4d09f9a14bea13e81af03c914074cd37cb9
2010-01-06 22:35:46 -05:00
Romain Guy
de057c1dd4
Merge "Fix two ListView bugs related to onAttachedToWindow/onDetachedFromWindow. Bug: #2359368."
2010-01-06 18:50:53 -08:00
Romain Guy
21875052ad
Fix two ListView bugs related to onAttachedToWindow/onDetachedFromWindow.
...
Bug: #2359368 .
onDetachedFromWindow() would never be called for views living in the scrap heap, but onAttachedToWindow() could be called several times for views recycled from the scrap heap.
2010-01-06 18:48:08 -08:00
James Dong
a3452ad9be
Merge "Add MPEG to the file extensions that scanner cares"
2010-01-06 17:26:01 -08:00
Jason Sams
6d7b907ab5
Merge "Support npot on es 2.0 HW."
2010-01-06 17:25:32 -08:00
Oscar Montemayor
0caa13b257
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
6774d57cfc
Merge "PowerManagerService: When rebooting, ensure external storage is unmounted"
2010-01-06 16:45:52 -08:00
Doug Zongker
f68888951a
move Watchdog's settings from Gservices to Secure
...
Change-Id: Iac1146dafa12f9247874514c9aeefa5f8f83933d
2010-01-06 16:38:14 -08:00
Oscar Montemayor
8da98e30d8
Apps on SD card project.
...
A simple keystore to store system-only key material, by leveraging file system access permissions.
2010-01-06 16:23:57 -08:00
Doug Zongker
11881844d3
Merge "add ACCESS_CACHE_FILESYSTEM permission to core manifest"
2010-01-06 16:02:46 -08:00
San Mehat
14e69afdfc
PowerManagerService: When rebooting, ensure external storage is unmounted
...
Signed-off-by: San Mehat <san@google.com>
2010-01-06 15:36:01 -08:00
Jason Sams
74e02ef200
Support npot on es 2.0 HW.
2010-01-06 15:10:29 -08:00
Doug Zongker
6e99b7a3b2
add ACCESS_CACHE_FILESYSTEM permission to core manifest
...
All of the permissions in data/etc/platform.xml are defined in
core/res/AndroidManifest.xml, except for ACCESS_CACHE_FILESYSTEM. Add
it.
Change-Id: If7906bc0007484cc21196fb1c0593b967fd79920
2010-01-06 15:05:24 -08:00
Bjorn Bringert
9d8d9c22bb
Get correct density info when using resource URIs in ImageView
...
Before, when an android.resource URI was passed to
ImageView.setImageURI(), it was loaded through an InputStream.
This didn't get the density information correctly.
Instead, we use Resources to load the Drawable, which fixes
the denisty problem.
Change-Id: Ie8427ea04da43f414b49014d012671fc0aa27a30
2010-01-06 22:52:41 +00:00
San Mehat
d1265febc4
Merge "framework: MountService: Add initial support for Android Secure External Caches"
2010-01-06 14:30:56 -08:00
Dan Egnor
f7b6e1fd21
Merge "Fix SDK build problem until EventLog is published."
2010-01-06 14:15:53 -08:00
Dan Egnor
7402264b50
Fix SDK build problem until EventLog is published.
2010-01-06 14:14:39 -08:00