Brad Fitzpatrick
268957bcaf
am d335f9a9: am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
...
Merge commit 'd335f9a90375db18b2f77f22f62379ac2d257384'
* commit 'd335f9a90375db18b2f77f22f62379ac2d257384':
Negatively cache settings and proactively slurp settings into cache.
2010-08-24 18:17:09 -07:00
Romain Guy
375d19656a
Merge "Fix passion build"
2010-08-24 18:16:52 -07:00
Romain Guy
f6fcac7ce1
Fix passion build
...
Change-Id: I93322bd36a004ac5aa9a0409d22dbf36a2da1680
2010-08-24 18:17:31 -07:00
Brad Fitzpatrick
d335f9a903
am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
...
Merge commit 'bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a' into gingerbread-plus-aosp
* commit 'bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a':
Negatively cache settings and proactively slurp settings into cache.
2010-08-24 18:14:10 -07:00
Brad Fitzpatrick
bb0eb5ca84
Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
2010-08-24 18:10:36 -07:00
Joe Malin
edb6566e62
Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12"
2010-08-24 18:07:33 -07:00
Brad Fitzpatrick
f366a9b007
Negatively cache settings and proactively slurp settings into cache.
...
The settings database cache is tiny (or should be tiny) and can be
slurped into memory. Once it's in memory and we know we have it all
we can avoid going to disk at all for keys not in the cache.
This is a big percentage of the StrictMode violations & latency.
Change-Id: I649411be0c40d348f58376ccfb3eda059fd69fbc
2010-08-24 18:07:33 -07:00
Mathias Agopian
bce2e90ca9
am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
...
Merge commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64'
* commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64':
fix [2931513] Add support for setting the orientation of an ANativeWindow
2010-08-24 17:56:40 -07:00
Andreas Huber
8d9d751a8f
am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
...
Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2'
* commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2':
A first shot at proper support for seeking of rtsp streams.
2010-08-24 17:56:12 -07:00
Dianne Hackborn
cf44040d93
resolved conflicts for merge of d3cd2596 to master
...
Change-Id: I61a37a3be8b8115b225da272903ca917c33ae4a6
2010-08-24 17:47:42 -07:00
Adam Powell
e1a007fc26
Add the action bar to Theme.Light.Holo
...
Change-Id: Idbe41f6225b6915ffc942dfc499a930e69f46839
2010-08-24 17:35:26 -07:00
Romain Guy
a84e02ce3c
Merge "Use only one GL context per process, share chaches."
2010-08-24 17:20:20 -07:00
Romain Guy
fb8b763f76
Use only one GL context per process, share chaches.
...
Change-Id: Ieabaa25338d2f4b8d4fd90e7401ad6e7452eae11
2010-08-24 17:18:14 -07:00
Gilles Debunne
17b4d9ea82
am b32d0f23: am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
...
Merge commit 'b32d0f23a82452d6f7fa8c513e179f1287621905'
* commit 'b32d0f23a82452d6f7fa8c513e179f1287621905':
Fix for an NPE in TextView.
2010-08-24 16:58:48 -07:00
Brad Fitzpatrick
7f9106fb1f
am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
...
Merge commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca'
* commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca':
Some StrictMode API changes.
2010-08-24 16:58:27 -07:00
Daisuke Miyakawa
bbdd1d5d7b
am ff547a59: (-s ours) am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
...
Merge commit 'ff547a59494206a1555eafa296b68961b677ba90'
* commit 'ff547a59494206a1555eafa296b68961b677ba90':
Fix vCard so that it looks at IM correctly.
2010-08-24 16:58:05 -07:00
Irfan Sheriff
50454c2718
sendBroadcast needs protection
...
we need to check if system is ready for broadcasts
Change-Id: I342c51ae85c9ca1aa0cb289c673a20f582eb0423
2010-08-24 16:40:12 -07:00
Mathias Agopian
bc4389edfb
am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
...
Merge commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc' into gingerbread-plus-aosp
* commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc':
fix [2931513] Add support for setting the orientation of an ANativeWindow
2010-08-24 16:28:57 -07:00
Mathias Agopian
8395b4625b
Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
2010-08-24 16:23:12 -07:00
Daisuke Miyakawa
f76110cb6c
am 28060c8a: (-s ours) am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread
...
Merge commit '28060c8a806b58fc53f281688146877e8c37a504'
* commit '28060c8a806b58fc53f281688146877e8c37a504':
Make VCardTestsBase public.
2010-08-24 16:17:47 -07:00
Mathias Agopian
e96aa3e859
fix [2931513] Add support for setting the orientation of an ANativeWindow
...
Also implement support for cropping.
Change-Id: Iba5888dd242bf2feaac9e9ce26e404c1f404c280
2010-08-24 15:40:50 -07:00
Alex Sakhartchouk
a3c63e5be8
Merge "More work on the renderscript sample"
2010-08-24 15:31:30 -07:00
Robert Greenwalt
3ded7cb58c
am 510f9f86: am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread
...
Merge commit '510f9f869fea26b5c11bfc738e7637c988e9d3d0'
* commit '510f9f869fea26b5c11bfc738e7637c988e9d3d0':
Send all Connectivity broadcasts.
2010-08-24 15:21:08 -07:00
Gilles Debunne
96ca16a9a8
New UI style in ListViews.
...
Introduces simple_selectable_list_item for new Holo theme list selection.
Also fixes bug http://b/issue?id=2942491 for colors.
Change-Id: I966a4f612a784557797bfa76bae019b2515724f2
2010-08-24 15:18:21 -07:00
Gilles Debunne
6023b5810e
Merge "resolved conflicts for merge of 9765b2a0 to master"
2010-08-24 15:15:19 -07:00
Gilles Debunne
925f2f9096
resolved conflicts for merge of 9765b2a0 to master
...
Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53
2010-08-24 15:14:12 -07:00
Andreas Huber
67ca90b339
am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
...
Merge commit '6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp
* commit '6b6ae996b2e84af030397cff3a7f0087de93e01c':
A first shot at proper support for seeking of rtsp streams.
2010-08-24 15:06:31 -07:00
Andreas Huber
6b6ae996b2
Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
2010-08-24 15:01:14 -07:00
Neel Parekh
ed8188711a
Have the band tag parsed into album artist.
...
Some vendors don't use the albumartist tag, but instead put the
album artist tag in the band tag.
Change-Id: Iea3144d55e4db3a28853bcd06bc72366de4421dc
2010-08-24 14:51:47 -07:00
Dianne Hackborn
d3cd259675
am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread
...
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp
* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
Verify that onPause() calls its superclass.
2010-08-24 14:47:46 -07:00
Dianne Hackborn
4af0cfad53
Merge "Verify that onPause() calls its superclass." into gingerbread
2010-08-24 14:44:42 -07:00
Eric Laurent
0e30200ed1
am 33e0d834: am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread
...
Merge commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa'
* commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa':
LVM release 1.05 delivery
2010-08-24 14:43:54 -07:00
Andreas Huber
e0dd7d3960
A first shot at proper support for seeking of rtsp streams.
...
Change-Id: I9604f2d09feedc0074c0e715be58e719d4483760
related-to-bug: 2556656
2010-08-24 14:33:58 -07:00
Wink Saville
c28227d443
Merge "Allow reliable detection of a message that is in use."
2010-08-24 14:33:29 -07:00
Adam Powell
a3715c151b
Merge "Disable FEATURE_ACTION_BAR on windows with incompatible feature sets."
2010-08-24 14:29:48 -07:00
Gilles Debunne
b32d0f23a8
am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
...
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp
* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
Fix for an NPE in TextView.
2010-08-24 14:25:57 -07:00
Gilles Debunne
e2978c8dca
Merge "Fix for an NPE in TextView." into gingerbread
2010-08-24 14:23:37 -07:00
Gilles Debunne
4e765e002f
Fix for an NPE in TextView.
...
Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
2010-08-24 14:21:13 -07:00
Brad Fitzpatrick
6cf1a8bfb0
am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
...
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp
* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
Some StrictMode API changes.
2010-08-24 14:18:26 -07:00
Adam Powell
f4a6ec4e93
Disable FEATURE_ACTION_BAR on windows with incompatible feature sets.
...
Change-Id: I70c860c72eb9e1f1f123764202334ab714f4f830
2010-08-24 14:18:10 -07:00
Brad Fitzpatrick
b1bbe99aaa
Merge "Some StrictMode API changes." into gingerbread
2010-08-24 14:15:30 -07:00
Alex Sakhartchouk
d36f248eaf
More work on the renderscript sample
...
Change-Id: Ib1812bbaa38180ca63d6d53c9cc3aeeee4134725
2010-08-24 14:00:58 -07:00
Daisuke Miyakawa
ff547a5949
am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
...
Merge commit '88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp
* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
Fix vCard so that it looks at IM correctly.
2010-08-24 13:39:42 -07:00
Daisuke Miyakawa
28060c8a80
am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread
...
Merge commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f' into gingerbread-plus-aosp
* commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f':
Make VCardTestsBase public.
2010-08-24 13:39:37 -07:00
Daisuke Miyakawa
88bff62c35
Merge "Fix vCard so that it looks at IM correctly." into gingerbread
2010-08-24 13:37:02 -07:00
Daisuke Miyakawa
6dd19ca5cb
Merge "Make VCardTestsBase public." into gingerbread
2010-08-24 13:36:43 -07:00
Daisuke Miyakawa
4a2a2eb4cb
Fix vCard so that it looks at IM correctly.
...
Change-Id: I3afc01e2e5f55c254606379f353b030ea297ee36
2010-08-24 13:33:25 -07:00
Chet Haase
7a9f6faa3c
Merge "Add facilities for layout transitions"
2010-08-24 13:15:45 -07:00
Chet Haase
49afa5bc10
Add facilities for layout transitions
...
Change-Id: I5c73ce6c6ba3bc9e3b57fcfbbcab37d511db6132
2010-08-24 13:09:20 -07:00
Guang Zhu
c4f44cb995
Merge "change the DRT to use Light theme"
2010-08-24 13:06:50 -07:00