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

52081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
6564c3c6ab Merge "Fix the comment for the location box @xyz" 2011-06-06 15:54:10 -07:00
Ben Komalo
98ded72258 Merge "Makes SSLCertificateSocketFactory more flexible" 2011-06-06 15:50:10 -07:00
Ben Komalo
1b52806e21 Makes SSLCertificateSocketFactory more flexible 
Specifically, this adds support for specifying custom
{Trust,Key}Managers in the socket factory.

Change-Id: I1fdf6587064c71ae0520f73821923dcad8d140ad
 2011-06-06 15:10:33 -07:00
Fabrice Di Meglio
890e013c05 Merge "Fix USE_TEXT_LAYOUT_CACHE define" 2011-06-06 14:14:36 -07:00
Martijn Coenen
4e75dbb94d Merge "Connecting to a NFC technology may fail." 2011-06-06 13:46:47 -07:00
Jeff Brown
49470743fa Merge "Copy pointer assets for hdpi." 2011-06-06 13:14:13 -07:00
Jeff Brown
44771f14ec Copy pointer assets for hdpi. 
Change-Id: I0012c651d8e550bbb0e2c75046f3138f7dd5f6a6
 2011-06-06 13:03:25 -07:00
Nick Pelly
2343befbb8 am 92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit '92279c0fa1c15bd4afaf051bed90776fa64744c1':
 2011-06-06 12:57:32 -07:00
TK MUN
60a3117838 am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 12:57:24 -07:00
Eric Fischer
a959c8ff90 am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e34ed24f4d32ad20716caf3056a7b007a0277500':
  Import revised translations.  DO NOT MERGE
 2011-06-06 12:57:14 -07:00
Jaikumar Ganesh
830d8c5fb3 am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '5aaed0970be451479a07b2423e709026dec6611b':
  Require bonding and encryption for PBAP server
 2011-06-06 12:56:55 -07:00
Jean-Baptiste Queru
cc19d9059f am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '59242cf65ec775ccb6cb3639df4eab6af09f3108':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 12:56:29 -07:00
Marco Nelissen
03db358cbc Merge "resolved conflicts for merge of b2fd84ad to master" 2011-06-06 12:33:40 -07:00
Marco Nelissen
8645017517 resolved conflicts for merge of b2fd84ad to master 
Change-Id: I36b8dba94386981e95abbb0ac8db5e84cce56fb9
 2011-06-06 12:30:40 -07:00
Nick Pelly
92279c0fa1 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-06-06 11:52:21 -07:00
Fabrice Di Meglio
af033caf26 Fix USE_TEXT_LAYOUT_CACHE define 
- fix compilation issues

Change-Id: I3358457d94d2278804e81e4ca96c9633ed76a147
 2011-06-06 11:51:46 -07:00
TK MUN
51704fc9c2 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 11:51:22 -07:00
Eric Fischer
e34ed24f4d am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
RoboErik
3ee7a25cb1 Merge "Cleanup of Calendar.java to prep for api" 2011-06-06 11:39:40 -07:00
Jaikumar Ganesh
5aaed0970b am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
  Require bonding and encryption for PBAP server
 2011-06-06 11:34:11 -07:00
Jean-Baptiste Queru
59242cf65e am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 11:33:52 -07:00
Eric Fischer
e9d32283e4 am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Alex Sakhartchouk
aece2ccccb Merge "Unhiding render target code for renderscript" 2011-06-06 10:54:26 -07:00
RoboErik
c2d5330c1c Cleanup of Calendar.java to prep for api 
Added comments. Made internal only stuff private. Added @hide to
methods only used by the provider. Added/altered methods for
consistency across contract classes.

Change-Id: I4d810995042583f1ab05b859f320828f83329e90
 2011-06-06 10:52:33 -07:00
Eric Fischer
b16b020dd3 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-06 10:38:42 -07:00
Marco Nelissen
b2fd84ad1d resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp 
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
 2011-06-06 09:55:15 -07:00
John Reck
f7445916c5 Merge "Delay set picture if necessary" 2011-06-06 09:25:44 -07:00
Alex Sakhartchouk
85dae045a2 Unhiding render target code for renderscript 
Change-Id: I32d80e6c49dbda955402f7ddffdb213c70ddbec9
 2011-06-06 09:25:17 -07:00
Glenn Kasten
a093ca9c73 Merge "Remove dead code related to gettid" 2011-06-06 09:12:05 -07:00
Marco Nelissen
5ca271efe9 Merge "Add WebP Mime-Type support in Android Media File" 2011-06-06 08:21:07 -07:00
Martijn Coenen
ea51a4275a Connecting to a NFC technology may fail. 
NotSupportedOperationException will be thrown in these cases,
unchecked for now.

Bug: 4195403
Change-Id: I48f4f277d43afba8bc505ae2a6c216cc387b1e97
 2011-06-06 12:43:05 +02:00
Shih-wei Liao
40f4efe712 Merge "Fix the false-alarm bug when we skip to the end, which should be OK." 2011-06-05 00:58:40 -07:00
Shih-wei Liao
6e66725e1c Fix the false-alarm bug when we skip to the end, which should be OK. 
Fix the bug b/4540617.

Change-Id: I64a77b8c5d89bcd35f81d196928a671c954e9a28
 2011-06-05 00:56:22 -07:00
John Reck
83e5929d4c Delay set picture if necessary 
Normally this wouldn't happen as a new picture should come after
 webcore has initialized. However, now that a view state can be loaded,
 setting a new picture needs to be delayed until after everything has
 initialized.

Change-Id: I823bc17eb939eab0436d7a398ebcbe849c0fb945
 2011-06-04 19:50:29 -07:00
Wink Saville
f9f805c367 Merge "resolved conflict for merge of fc51aaec to master" 2011-06-04 08:19:00 -07:00
Daniel Sandler
f81c70944a Merge "Fix the status bar test app." 2011-06-04 07:38:08 -07:00
Wink Saville
1b9a6a6e58 resolved conflict for merge of fc51aaec to master 
Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df
 2011-06-04 07:31:35 -07:00
Wink Saville
fc51aaec82 am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 
* commit '6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
  Add FileUtils.checksumCrc32
 2011-06-04 06:24:40 -07:00
Wink Saville
6ff5ba00b0 Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 2011-06-04 06:15:21 -07:00
Svetoslav Ganov
c321c19fc9 Fixing a bug I introduced during my last merge. 
Change-Id: I6474ca94a6ef9bd17a5670a4baa51673f3c2f5d0
 2011-06-03 19:49:00 -07:00
Romain Guy
8cdda44235 Merge "Measure text with the appropriate text encoding. Bug #4546327" 2011-06-03 18:52:41 -07:00
Romain Guy
67ffc36a79 Measure text with the appropriate text encoding. 
Bug #4546327

Change-Id: I8eb593b03a81145e08be92579706ddd775feb0a2
 2011-06-03 18:51:11 -07:00
Dianne Hackborn
3267d356d1 am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit '7e5ca5781b406d4f862254dad1758b91ce89f896':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 18:02:10 -07:00
Roman Nurik
1d3a5c1133 am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '16475a3a40beac982886ce6bc300f4ffe29f581d':
  Add old blog posts as articles, batch 1
 2011-06-03 18:02:01 -07:00
Dianne Hackborn
29bf330727 am e826feb6: am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'e826feb66c2a3690716136c24926606eafe827dc':
  Fix when managed cursors are required.
 2011-06-03 18:01:57 -07:00
Robert Greenwalt
1e36ddabed am 89c1eb8e: am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE 
* commit '89c1eb8edcf2920b4f72e2ca63817a901e2340d7':
  Promote Telephony's isDataPossible.
 2011-06-03 18:01:46 -07:00
Dianne Hackborn
7e5ca5781b am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:57:33 -07:00
Dianne Hackborn
b4815f47e6 am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'bd754205d0b59315582855329649dad925a04b82':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:54:28 -07:00
Dianne Hackborn
bd754205d0 Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 2011-06-03 17:52:23 -07:00
James Dong
d4c6a5be80 Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h" 2011-06-03 17:43:20 -07:00