drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,926 Commits 1 Branch 0 Tags
Commit Graph

16926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrei Popescu
93aea69649 Merge "Implement timeupdate events for video tag." 2010-01-12 08:17:27 -08:00
Andrei Popescu
048eb3bfa1 Implement timeupdate events for video tag. 
Fix http://b/issue?id=2210105
 2010-01-12 16:13:52 +00:00
Niko Catania
45b7629afd Merge "Fix the CallerInfo lookup when a phone URL is used." 2010-01-12 07:55:27 -08:00
Cary Clark
bad0c54de9 rebuild the nav cache if the clicked on node is invalid 
Rebuild the nav cache in the webkit thread after determining
that the clicked on node isn't valid. Remove old code that
passed a flag to avoid using the invalid node, since it
should always be valid now.

requires a companion fix in external/webkit

fixes http://b/2362334
 2010-01-12 09:18:08 -05:00
Joe Onorato
f523609e8d stop crashing. I'm not sure what triggered this. 2010-01-11 20:15:46 -05:00
Jim Miller
58f24686dc Merge "Fix 2332563: Add password-lock support to lockscreen" 2010-01-11 17:12:13 -08:00
Romain Guy
5c7a5d0857 Merge "Fix how RelativeLayout handles alignParentBottom/Right when dimension is wrap_content. Bug: #2194109." 2010-01-11 16:48:10 -08:00
Romain Guy
42460ac1bb Fix how RelativeLayout handles alignParentBottom/Right when dimension is wrap_content. 
Bug: #2194109.
 2010-01-11 16:47:30 -08:00
Grace Kloba
bb4ad6a8a3 Merge "As setNewZoomScale is called asynchronously, the WebView can be destroyed. If it is, skip scaling." 2010-01-11 16:35:32 -08:00
Andreas Huber
593c6a5516 Merge "The mp3 decoder should not assert that decoding was successful but return an error instead." 2010-01-11 16:08:56 -08:00
Tom O'Neill
25391832fc Merge "Improve ContactsContract documentation, esp. of Data inner class" 2010-01-11 15:59:36 -08:00
Nicolas Catania
c72509b4d8 Fix the CallerInfo lookup when a phone URL is used. 
Typically the CallerInfo is looked up based on a phone number, in which case the '_id' column
contains the contact id.

However when the lookup is based on a phone row, the '_id' column is the row number we queried.
The contact id is stored somewhere else in a 'contact_id' column.

The current fix, checks the mime type of the contactRef URL to find out which column contains
the contact id.
I think the contact DB should be more consistent and always return the contact id AS contact_id even
in the phone number scenario.

Bug:2269240
 2010-01-11 15:58:10 -08:00
Jim Miller
69aa4a953f Fix 2332563: Add password-lock support to lockscreen 2010-01-11 15:50:39 -08:00
Tom O'Neill
244327e209 Improve ContactsContract documentation, esp. of Data inner class 
Provide some missing javadoc, make some things a little more explicit, etc.

Change-Id: Ibcdeaa10c641436009a3494b18cecae6f816b75e
 2010-01-11 15:49:59 -08:00
Grace Kloba
4c7ec8d6ab As setNewZoomScale is called asynchronously, the 
WebView can be destroyed. If it is, skip scaling.

Fix http://b/issue?id=2366538
 2010-01-11 15:36:37 -08:00
Xavier Ducrohet
6d40ee33f5 am f5a84f8a: am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair 
Merge commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8'

* commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8':
  LayoutLib: support for custom styles.
 2010-01-11 15:30:29 -08:00
Xavier Ducrohet
f5a84f8a7f am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair 
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
 2010-01-11 15:28:07 -08:00
Xavier Ducrohet
dfe25b0e0c Merge "LayoutLib: support for custom styles." into eclair 2010-01-11 15:25:16 -08:00
Dan Egnor
6ee699102f Merge "Simplify & update ANR logging; report ANR data into the dropbox. Eliminate the per-process 200ms timeout during ANR thread-dumping. Dump all the threads at once, then wait for the file to stabilize. Seems to work great and is much, much, much faster." 2010-01-11 15:09:51 -08:00
Andreas Huber
b6d5d1b7b3 Merge "Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string." 2010-01-11 14:56:39 -08:00
Dan Egnor
42471dd555 Simplify & update ANR logging; report ANR data into the dropbox. 
Eliminate the per-process 200ms timeout during ANR thread-dumping.
Dump all the threads at once, then wait for the file to stabilize.
Seems to work great and is much, much, much faster.

Don't dump stack traces to traces.txt on app crashes (it isn't very
useful and mostly just clutters up the file).

Tweak the formatting of the dropbox dumpsys a bit, for readability,
and avoid running out of memory when dumping large log files.

Report build & kernel version with kernel log dropbox entries.
 2010-01-11 14:51:22 -08:00
Xavier Ducrohet
9ce3b775f5 LayoutLib: support for custom styles. 
Change-Id: Ic6c2ef234589f45db15024261d698066aa6e2f4e
 2010-01-11 14:28:03 -08:00
Jean-Michel Trivi
17acf1747f Merge "Apply EQ on the output of the speech synthesis only when using the Pico TTS engine." 2010-01-11 14:26:17 -08:00
Jaikumar Ganesh
1f3856c446 am 495d820c: am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it. 
Merge commit '495d820c0124a811b9352b93ce4fe88c716f259d'

* commit '495d820c0124a811b9352b93ce4fe88c716f259d':
  Don't set priority in Bonding state.
 2010-01-11 14:23:18 -08:00
Tom Taylor
6e106ff7b4 am 2bb1f870: am 1edd8277: Merge "Hide unused fields" into eclair 
Merge commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6'

* commit '2bb1f87089faa14954c1b5afa92a34ea947f5ff6':
  Hide unused fields
 2010-01-11 14:23:09 -08:00
Andreas Huber
afce2158a2 The mp3 decoder should not assert that decoding was successful but return an error instead. 2010-01-11 14:21:26 -08:00
Jaikumar Ganesh
495d820c01 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it. 
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
 2010-01-11 14:20:53 -08:00
Jaikumar Ganesh
ccaebfc942 Don't set priority in Bonding state. 
This was causing A2DP get connected for Car Docks, when user didn't select it.

Bug: 2364328
Dr No: Eastham
 2010-01-11 14:16:29 -08:00
Jean-Michel Trivi
0320f8bdfb Apply EQ on the output of the speech synthesis only when using the Pico 
TTS engine.
 2010-01-11 14:16:28 -08:00
Tom Taylor
2bb1f87089 am 1edd8277: Merge "Hide unused fields" into eclair 
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
 2010-01-11 14:15:51 -08:00
Derek Sollenberger
c408d5c278 am 1fed31aa: am fef4874a: fixing build break by removing unused imports. 
Merge commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8'

* commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8':
  fixing build break by removing unused imports.
 2010-01-11 14:14:28 -08:00
Tom Taylor
1edd827744 Merge "Hide unused fields" into eclair 2010-01-11 14:11:46 -08:00
Trevor Johns
9cebb377c5 am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'

* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:08:15 -08:00
Trevor Johns
18dedf2cdf am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:05:55 -08:00
Trevor Johns
50a3977c61 Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 2010-01-11 14:00:54 -08:00
Paul Westbrook
44641d3db3 Bug 2321983 
Move SYNC_DETAILS from framework/base to the gsf clientlib
 2010-01-11 14:00:35 -08:00
Dirk Dougherty
88098683b0 am 6b113b1a: am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9'

* commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 13:50:42 -08:00
Grace Kloba
19588a59d8 am 6c87c77d: (-s ours) am a2b0d38f: First draft of multitouch in the WebView. 
Merge commit '6c87c77de449f6f85b822022501c2de7ecd24660'

* commit '6c87c77de449f6f85b822022501c2de7ecd24660':
  First draft of multitouch in the WebView.
 2010-01-11 13:49:49 -08:00
Derek Sollenberger
1fed31aa81 am fef4874a: fixing build break by removing unused imports. 
Merge commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009' into eclair-mr2-plus-aosp

* commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009':
  fixing build break by removing unused imports.
 2010-01-11 13:31:43 -08:00
Andreas Huber
5ebc8898d7 Fix an uninitialized read detected by valgrind. The array to be copied is statically sized and not a c-string. 
related-to-bug: 2366619
 2010-01-11 13:30:08 -08:00
Derek Sollenberger
fef4874afd fixing build break by removing unused imports. 2010-01-11 16:26:07 -05:00
Derek Sollenberger
86cf1ad0e5 am d55aa751: am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context. 
Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'

* commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f':
  consolidating to only use one surface per plugin. give plugin access to java context.
 2010-01-11 13:23:41 -08:00
Derek Sollenberger
d55aa75138 am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context. 
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp

* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
  consolidating to only use one surface per plugin. give plugin access to java context.
 2010-01-11 13:11:13 -08:00
Jack Palevich
9d8c31188c am 90ce68a9: (-s ours) am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 
Merge commit '90ce68a99f8803643d83be963aa0f28fa952a186'

* commit '90ce68a99f8803643d83be963aa0f28fa952a186':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.
 2010-01-11 13:00:36 -08:00
Vasu Nori
380ae0a6d4 am 9c74295f: am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 
Merge commit '9c74295fb16da0469304a7c04c471915e28d09bd'

* commit '9c74295fb16da0469304a7c04c471915e28d09bd':
  add eventlog message whenever sqlite reports db corruption error
 2010-01-11 13:00:28 -08:00
Scott Main
333beab9d6 am c9a26f29: am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering) 
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'

* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
  javadoc change: fix the selector sample XML in the class
 2010-01-11 13:00:14 -08:00
Trevor Johns
2187e240c0 Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com. 2010-01-11 11:56:27 -08:00
Dirk Dougherty
6b113b1a82 am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp

* commit '595f48b2a4fa2751ad638b60d2476e77738b21da':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 11:38:04 -08:00
Dirk Dougherty
595f48b2a4 Merge "SDK doc change: Miscellaneous fixes." into eclair 2010-01-11 11:33:57 -08:00
Dirk Dougherty
cf6bbab6db SDK doc change: Miscellaneous fixes. 
Bug: 2160782
Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32
 2010-01-11 11:15:22 -08:00