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

34603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
6dcab2099b am 153bf6c8: am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4'

* commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-21 13:44:47 -07:00
Justin Ho
d829c4756c am a747b439: (-s ours) am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 
Merge commit 'a747b4399300beae712dacdf189f10e91b3623a0'

* commit 'a747b4399300beae712dacdf189f10e91b3623a0':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
 2010-10-21 13:44:16 -07:00
Hung-ying Tyan
6d848f759e am bdc15d8b: am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 
Merge commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625'

* commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625':
  Add permission requirements to SipAudioCall and SipManager javadoc.
 2010-10-21 13:44:06 -07:00
Hung-ying Tyan
2cef210f53 am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone. 
Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8'

* commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8':
  Fix n-way conf call in SipPhone.
 2010-10-21 13:43:43 -07:00
Daniel Lehmann
c2238d0062 Fix default style in constructor with only one parameter 
Bug:3011901
Change-Id: I6c1b8663ccdfae36d2bb5e63fdc852b6391f3585
 2010-10-21 13:37:32 -07:00
Dmitri Plotnikov
beb2178b49 Making multi-values extra in contact INSERT intent public. 
Change-Id: I27da6278027a8b6a18b8dea756aa4ed8920ec748
 2010-10-21 13:31:57 -07:00
Chet Haase
bdccfe4ac4 Merge "Optimizing display lists by referencing pointers to resources instead of copying them" 2010-10-21 13:29:26 -07:00
Joe Onorato
f3c3c4fd14 Refactor SystemUI so the status bar isn't a Service of its own. 
There is now one SystemUIService, which starts the status bar service.
Pretty soon there will be other things running in here too.  This way
we don't need to have each of them started by something individually.

This also moves the choice between tablet and phone status bar into
SystemUI.apk, which seems like a much better place for it.

Change-Id: Ib69ef2f43d648764f8dbb52008f5d036a1ee07d9
 2010-10-21 15:42:34 -04:00
Daniel Sandler
10e370c689 Merge "New system bar "shirt pocket", for quickly stashing draggable bits." 2010-10-21 12:24:12 -07:00
Chet Haase
5c13d89c13 Optimizing display lists by referencing pointers to resources instead of copying them 
Change-Id: I81ad3551d74aa1e5bb64d69e33d2eb29a6c1eb6a
 2010-10-21 12:02:42 -07:00
Joe Onorato
96cf6a403b Merge "Don't remove items from mRecords while iterating over it." 2010-10-21 12:00:33 -07:00
Daniel Sandler
524f568802 New system bar "shirt pocket", for quickly stashing draggable bits. 
Anything that can be dragged using the new drag manager APIs
(View#startDrag) can be dropped here; the pocket will hold
it for you until you're ready to drag it out again.

Known issues:
 - currently discarding the clipping whenever you drag it
   out; in the future we will only discard it once you
   actually drag it somewhere
 - there's a bug where dragging things back out of the
   pocket's window requires an extra tap (i.e. tap once then
   tap and drag)
 - almost nothing uses the new drag manager yet :)

Change-Id: Iff3103e4117f31023e1e96667632d77912e21d30
 2010-10-21 14:54:00 -04:00
Gilles Debunne
83322fd4db Merge "Fix to display first tab as selected on tab widget creation." 2010-10-21 11:19:10 -07:00
Jeff Hamilton
6967f09604 am e55806a5: am 23392a84: Fix the build. 
Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d'

* commit 'e55806a55561c992086ddff717aca27206fa0c5d':
  Fix the build.
 2010-10-21 10:56:19 -07:00
Hung-ying Tyan
fbd21b5875 am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and... 
Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e'

* commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e':
  Do another contact lookup if the first one fails and...
 2010-10-21 10:56:11 -07:00
Hung-ying Tyan
821f087989 am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 
Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'

* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
  Silently reject a ringing call when another call is dialing/ringing.
 2010-10-21 10:56:02 -07:00
Dianne Hackborn
b37cc33030 am b5018723: am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Merge commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe'

* commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
 2010-10-21 10:55:52 -07:00
Hung-ying Tyan
164cd438fb am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread 
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'

* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
  Remove ringtone API from SipAudioCall.
 2010-10-21 10:55:33 -07:00
Dirk Dougherty
4ef36afa32 am 18cbc0e5: am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '18cbc0e58a0e68411dff655f116a7010c3f464a2'

* commit '18cbc0e58a0e68411dff655f116a7010c3f464a2':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-21 10:55:21 -07:00
Hung-ying Tyan
4e00a8d582 am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread 
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().
 2010-10-21 10:53:49 -07:00
Mathias Agopian
0d4e658bad am add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 
Merge commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5'

* commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
 2010-10-21 10:47:32 -07:00
Mindy Pereira
9a9849ac7f am 62ad0db6: (-s ours) am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Merge commit '62ad0db62393073a8cda9b21e4ae1506954c10a5'

* commit '62ad0db62393073a8cda9b21e4ae1506954c10a5':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
 2010-10-21 10:47:15 -07:00
Joe Onorato
163d8d972b Don't remove items from mRecords while iterating over it. 
This change also make removeList a member, because it's only
actually used in an error case (when the client process has
gone away).

Bug: 3118244
Bug: 3083062
Bug: 2876696
Bug: 2778958
Change-Id: I856118d8de4309cd63287d7c57cd938e1c35dab0
 2010-10-21 13:32:49 -04:00
Scott Main
9c09ebd2b4 am b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit 'b619e3332d36a8b5c56da6530834be8cc69272df'

* commit 'b619e3332d36a8b5c56da6530834be8cc69272df':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-21 09:56:04 -07:00
Jean-Baptiste Queru
3317c6db00 am 2cead908: am db723ea0: Merge "jni: Remove duplicated jniThrowException()" 
Merge commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102'

* commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102':
  jni: Remove duplicated jniThrowException()
 2010-10-21 09:54:58 -07:00
Chung-yih Wang
16f5d6ee79 am aefcdde4: am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService. 
Merge commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6'

* commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6':
  Periodically scan wifi when wifi is not connected and wifi lock is
 2010-10-21 09:51:01 -07:00
Hung-ying Tyan
9d6d17fcd8 am 35d9e770: am 0a6e717f: Handle dialing a SIP call to self. 
Merge commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2'

* commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2':
  Handle dialing a SIP call to self.
 2010-10-21 09:50:50 -07:00
Brad Fitzpatrick
a294faffc9 am 6799864d: am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 
Merge commit '6799864d6c9744e4c5133a90410576b577d65de6'

* commit '6799864d6c9744e4c5133a90410576b577d65de6':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
 2010-10-21 09:47:27 -07:00
Joe Onorato
749984798c fix bad merge 
Change-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81
 2010-10-21 11:38:25 -04:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
 2010-10-21 07:39:10 -07:00
Chris Tate
a376d030a2 Merge "Fix obtain() when the pool is still empty" 2010-10-20 19:04:34 -07:00
Chris Tate
c02c7af0ec Fix obtain() when the pool is still empty 
Fixes bug 3116798

Change-Id: I187e79892cd2b60173ef4ebef5d2eab56eb5eb42
 2010-10-20 19:01:55 -07:00
Gilles Debunne
97dfd3492f Fix to display first tab as selected on tab widget creation. 
Change-Id: Icc6ec78d2392a300b43b522b3dc18d0ab1223116
 2010-10-20 18:26:57 -07:00
Brad Fitzpatrick
cf8918874d Revert "Add length-equality test in String operator== checks." 
This reverts commit e28210d401ae4ed1258b84c9b17a172a757190e8.
 2010-10-20 17:06:28 -07:00
Jamie Gennis
6913c6176b Fix a copy & paste logging error. 
This change corrects the name of a variable used in a logging macro,
allowing AwesomePlayer.cpp to build with verbose logging enabled.

Change-Id: Ie23fe0fb17f08ac43348cee3209bfe68088e856e
 2010-10-20 16:05:40 -07:00
Jamie Gennis
7eac136a39 Merge "Fix the non-ANW video decode path." 2010-10-20 16:04:12 -07:00
Jamie Gennis
dbfb32e902 Fix the non-ANW video decode path. 
The BufferInfo::mOwnedByNativeWindow field was not being initialized in
the non-ANativeWindow video decode path.

Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
 2010-10-20 15:53:59 -07:00
Wink Saville
4b7ba09c8b Change removeNetowrk to a synchronous channel call. 
Change-ID: Iad0380d56972826615e044fa2aaee418b617d732
 2010-10-20 15:52:42 -07:00
Wink Saville
1b35f942ec Merge "Add AsyncChannel and AsyncService." 2010-10-20 15:51:23 -07:00
Brad Fitzpatrick
fb3132e866 Merge "Add length-equality test in String operator== checks." 2010-10-20 15:47:04 -07:00
Wink Saville
d20a5d6b5a Add AsyncChannel and AsyncService. 
Change-Id: Ie6f9aed58f49defcd1c051611ce791e2e62a9474
 2010-10-20 15:17:28 -07:00
Andreas Huber
fb26350c00 Merge "If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset()." 2010-10-20 15:13:09 -07:00
Andreas Huber
eaf2c5a5c3 If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset(). 
Change-Id: I71a59d5e019e7b9ec3d9375d6231cc301ad3999b
 2010-10-20 15:12:05 -07:00
Andreas Huber
65b51941e3 Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF." 2010-10-20 15:11:02 -07:00
Brad Fitzpatrick
e28210d401 Add length-equality test in String operator== checks. 
Change-Id: I6ebc6ef85aac4539269f137c1f29f95b9828d4f9
 2010-10-20 15:03:49 -07:00
Andreas Huber
a0b442edbf Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF. 
Change-Id: I57eaefdc4b300a8f56bbe5cf3a34c424e8efe63a
related-to-bug: 3084183
 2010-10-20 15:01:01 -07:00
Andreas Huber
1dcb42b772 Merge "Make sure we can encode the size of the codec specific data in a single byte." 2010-10-20 14:33:06 -07:00
Andreas Huber
1df9a7b133 Make sure we can encode the size of the codec specific data in a single byte. 
Change-Id: If7680cbfb380180c8dd6d6019b9c6c67661e468d
 2010-10-20 14:29:41 -07:00
Dianne Hackborn
153bf6c8d7 am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp

* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-20 14:10:29 -07:00
Dianne Hackborn
e9e2340583 Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread 2010-10-20 14:08:26 -07:00