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

50257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
ce0ce2dde2 Merge from honeycomb-plus-aosp 
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
 2011-05-12 17:23:41 -07:00
Irfan Sheriff
2cd423a049 Merge commit '01ea7f01' into manualmerge1 2011-05-12 17:19:56 -07:00
Dianne Hackborn
88bf0e5ae7 Merge "resolved conflicts for merge of 0e59729b to master" 2011-05-12 17:15:22 -07:00
John Reck
c51ab9b93d Merge "Adding functions to query the state of a WebElement." 2011-05-12 17:00:38 -07:00
Chia-chi Yeh
a210ae5cef Merge "Add a method to create ParcelFileDescriptors from DatagramSockets." 2011-05-12 16:55:58 -07:00
Dianne Hackborn
a8138732a0 MR2 is going to be API 13. 
Change-Id: I05b65ace073b8731e85b41ac4ae63e2745cb46b5
 2011-05-12 16:26:47 -07:00
Chia-chi Yeh
47f8f0fa70 Add a method to create ParcelFileDescriptors from DatagramSockets. 
Change-Id: I16dddb2395628657b140b53a1b2fee5f311b049a
 2011-05-12 16:25:27 -07:00
Dima Zavin
f76dd3abbe Merge "update for new audio.h header location" 2011-05-12 16:06:20 -07:00
Irfan Sheriff
55fa681ac7 am bb09485b: Merge commit \'09564fbb\' into manualmerge 
* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
  DO NOT MERGE Define Protocol class
 2011-05-12 16:02:43 -07:00
Jean-Baptiste Queru
e03efcb05f am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia" 
* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
  Adapt to latest skia
 2011-05-12 15:54:13 -07:00
Jean-Baptiste Queru
b0ca8b9dfd am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
  Ninepatch tweaks for better interop
 2011-05-12 15:52:16 -07:00
Jean-Baptiste Queru
fb401ca777 am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:52:12 -07:00
Jean-Baptiste Queru
11ace0015b am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:52:03 -07:00
Irfan Sheriff
bb09485bcb Merge commit '09564fbb' into manualmerge 2011-05-12 15:47:28 -07:00
Dianne Hackborn
3d0724dc22 resolved conflicts for merge of 0e59729b to master 
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
 2011-05-12 15:39:41 -07:00
Jean-Baptiste Queru
2d7d3f78c9 am f247e545: Merge "Adapt to latest skia" 
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
 2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
a84d29cb04 am 6714e677: Merge "Ninepatch tweaks for better interop" 
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
  Ninepatch tweaks for better interop
 2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
20fd3f0d83 am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
  Tweak audio APIs for better forward/backward/sideways compatibility.
 2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
e8b669cbd7 am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:38:07 -07:00
Gilles Debunne
ee511cc529 SuggestionSpans are preserved when picked. 
This is the exception case: text replacement should NOT remove SuggestionSpans
when this is the result of a Suggestion pick in the popup.

Save them and restore them after the text replacement.
Only spans that entirely englobe the replaced region make sense after the
text replacement.

Change-Id: Ib18eb6437c3a63fd0e788ebd4565c8f42e83503b
 2011-05-12 15:20:30 -07:00
Dianne Hackborn
df9799f0fc Fix build. 
Change-Id: I97e357aa20c9ba91f20f77d53fc4dca1fd3aa598
 2011-05-12 15:16:33 -07:00
Jean-Baptiste Queru
f247e545b5 Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Derek Sollenberger
0ceb9501b2 Adapt to latest skia 
Change-Id: I39247db04ca8b7993b0f5a16fb0324828d04cc3a
 2011-05-12 15:05:44 -07:00
Teng-Hui Zhu
858daa1fbb am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
 2011-05-12 15:05:29 -07:00
Dianne Hackborn
0e59729b10 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
 2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
a0e661b4e4 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
 2011-05-12 15:01:56 -07:00
Dianne Hackborn
972808164a am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
 2011-05-12 15:01:53 -07:00
Chet Haase
674b595fa5 Merge "Antialiasing for rectangles" 2011-05-12 14:57:51 -07:00
Chet Haase
858aa93ddb Antialiasing for rectangles 
Change-Id: I7ca6931606541ddd504bd5db7f8dc04b9cde8cd9
 2011-05-12 14:55:29 -07:00
Jean-Baptiste Queru
6714e67740 Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
9faa34e603 Ninepatch tweaks for better interop 
Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
 2011-05-12 14:22:43 -07:00
Jean-Baptiste Queru
4770c79c34 Merge "Tweak audio APIs for better forward/backward/sideways compatibility." 2011-05-12 14:19:41 -07:00
Jean-Baptiste Queru
71d25778c6 Merge "Switch to SkSafeUnref for better portability" 2011-05-12 14:19:26 -07:00
Irfan Sheriff
01ea7f01ec Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2 2011-05-12 14:18:03 -07:00
Irfan Sheriff
09564fbb9f Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2 2011-05-12 14:17:51 -07:00
Teng-Hui Zhu
c1a005c356 Merge "Fix the Uri parsing issue" into honeycomb-mr2 2011-05-12 14:11:25 -07:00
Irfan Sheriff
fe3b33d4ea DO NOT MERGE Add DhcpStateMachine 
Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
    to DHCP request/renewal being sent

Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98
 2011-05-12 14:10:11 -07:00
Dima Zavin
34bb419e59 update for new audio.h header location 
Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
 2011-05-12 14:09:57 -07:00
Wink Saville
1f5e3a1af3 am 9c7c8794: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE 
* commit '9c7c87941446cdd1263a87a8c4cc5672082c7e12':
  Fix initialization of RouteInfo
 2011-05-12 14:08:05 -07:00
Wink Saville
9c7c879414 am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE 
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
 2011-05-12 14:03:31 -07:00
Teng-Hui Zhu
64855da755 Fix the Uri parsing issue 
Switching back to use the setDataSource with Uri, which can handle both the
file and http path correctly.

Change-Id: I5bfc1d01a8de0a4f8640ffceafbc17984833097a
 2011-05-12 13:53:48 -07:00
Svetoslav Ganov
b856f43ea7 Merge "Propagating hover events to JavaScript in WebView" 2011-05-12 13:43:35 -07:00
Andreas Huber
dbbb28d719 Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes." 2011-05-12 13:40:37 -07:00
Andreas Huber
0a6f09e445 A fix to the MPEG4Extractor to support 16-bit sample sizes. 
Change-Id: Ic531f1ff0dd171f6f14aaad56aacbf3952a3aeae
 2011-05-12 13:38:20 -07:00
Wink Saville
5e9270bfd5 Add getLteOnCdamMode. 
Change-Id: Iebf027f956d543d7a69cad64aaba47900937a785
 2011-05-12 13:37:32 -07:00
Dianne Hackborn
0f1de9adde New compat mode front end: UI and persistence. 
Adds a really crappy UI for toggling compat mode.

Persists compat mode selection across boots.

Turns on compat mode by default for newly installed apps.

Change-Id: Idc83494397bd17c41450bc9e9a05e4386c509399
 2011-05-12 13:28:45 -07:00
Wink Saville
76a118dd9e Merge "Fix initialization of RouteInfo" into honeycomb-LTE 2011-05-12 13:26:44 -07:00
Andreas Huber
1abf1c59f8 Merge "The decoder wrapper is no longer needed. Also disable building old-style decoders." 2011-05-12 13:01:29 -07:00
Andreas Huber
93c612e2e7 The decoder wrapper is no longer needed. Also disable building old-style decoders. 
Change-Id: Ie022f1a6dffe619c1b0385aa13f63e097282cfe4
 2011-05-12 11:24:13 -07:00
Alex Sakhartchouk
25999a08a6 Cleanup mesh creation. 
Change-Id: Iaf5e060711dcb6341ac0f337dfb274528cb68d3e
 2011-05-12 10:49:39 -07:00