27652 Commits

Author SHA1 Message Date
Tom Taylor
e593ea103e Merge "Received MMS is not displayed properly with 'Avea' SIM Card" 2011-12-20 10:15:26 -08:00
Chet Haase
baea244a9f Fix ViewAnimator.getDisplayedChild() bug
Adding a view above the currently displayed child in a ViewAnimator
will cause the displayed child index to become stale, because it is
not incremented to reflect the new position of the currently displayed
view. This fix adds logic to the addView() override to increment the
index correctly.

Change-Id: I9c756ce51a8e8dcbeef8f0e4fbb3704482c21e9d
2011-12-20 08:59:12 -08:00
Jonathan Dixon
9cfff10bf5 Merge "Remove misleading API council comments" 2011-12-20 08:17:43 -08:00
Chet Haase
2d46fcc669 Minor small fixes to old Animation code and docs.
Change-Id: Ib8a1ba2d12e26cc42a2cec48312a5229bb6d4e8a
2011-12-20 07:57:23 -08:00
Xia Wang
8017794091 Remove sleep from test acitivity to avoid ANR when key event is injected
bug#: 5737922

Change-Id: I7871713c5000d122e63127b30d0151b8f5a29bcf
2011-12-19 17:20:04 -08:00
Nick Pelly
eca6d909f7 Merge "Rewrite NDEF parsing in Java, clean-up API." 2011-12-19 15:53:10 -08:00
Nick Pelly
a356bf1cd8 Rewrite NDEF parsing in Java, clean-up API.
o Lots of documentation fixes.
o Add NdefMessage(NdefRecord ... records) ctor
o Add NdefRecord.createMime()
o Add NdefRecord.createExternal()
o Add toString(), equals() and hashCode() implementations
o Deprecate NdefRecord(byte[]) and NdefRecord.toByteArray()
o Remove framework dependency on libnfc_ndef.so
o Remove NfcAdapter.getDefaultAdapter(), its been deprecated a while

next step:
o Attempt to move NdefMessage -> Intent conversion into NDEF, and
  make it CTS tested. This will ensure consistent NDEF -> Intent
  mapping across all Android devices.

Change-Id: Ifed4910caa9a1d6bad32dbf0a507ab22bca35e22
2011-12-19 15:48:35 -08:00
Jonathan Dixon
4cde13a3bb Remove misleading API council comments
Most of these APIs have no intention of being published, at least not in anything like the current form.

Change-Id: I1df3ae00320f909caea8a0d42d50ee7400577635
2011-12-19 16:01:31 +00:00
Chet Haase
d47f1531d0 Make Property objects in View final
The various Properties added to View in 4.0 (ALPHA, TRANSLATION_X, etc.)
were not final, making it possible to assign on property to another.
Not something that someone would want to do, but we should try to prevent
that kind of mess. This API change makes those properties final.

Change-Id: I7d0c7f738eb2074d0781b1ba6a7c19339bac4477
2011-12-16 13:44:01 -08:00
Jeff Brown
1fd4de0adc Merge "Add plumbing for dumping database info using dumpsys." 2011-12-16 12:33:54 -08:00
Jeff Brown
aaf30e370f Merge "Make SQLiteQuery and SQLiteProgram final." 2011-12-16 12:33:46 -08:00
Jeff Brown
69b3d10d66 Merge "Raise default connection pool size." 2011-12-16 12:33:42 -08:00
Joe Onorato
c6a7f358e8 Merge "Add a new ui mode for "appliance"" 2011-12-16 12:27:03 -08:00
Jeff Sharkey
931310f1d2 Merge "Include roaming in NetworkIdentity.hashCode()." 2011-12-16 11:56:06 -08:00
Jeff Sharkey
f9a3a8d42b Include roaming in NetworkIdentity.hashCode().
Change-Id: I148d95c8d08e3916a90fa78f7efee327d4b7de2a
2011-12-16 11:52:35 -08:00
Ben Murdoch
2c18ede18e Do not allow file:// access when it is disabled.
If WebSettings is configured to disallow access to file://
URLs, then block them.

Bug: 5773763
Change-Id: If2793f31cb37e0d3af15cb18e818bfa4058167fd
2011-12-16 18:15:23 +00:00
Jesse Wilson
4868dfa33b Merge "Give a reflection example for installing the HTTP response cache." 2011-12-16 07:37:22 -08:00
Jeff Brown
6754ba24f1 Add plumbing for dumping database info using dumpsys.
Change-Id: I51b0364c3d3d41aa38a759fbce48e625fff1b2dd
2011-12-16 04:01:00 -08:00
Jeff Brown
d5064be3b5 Make SQLiteQuery and SQLiteProgram final.
We can do this because the classes already cannot be subclassed
by applications due to the fact they only have package private
constructors.

One very nice consequence of this observation is that we can hide or
delete several @deprecated protected members which are effectively
inaccessible because applications cannot create subclasses!

Change-Id: I2d3a0d2ad72b9289ebcdf907e4e4e6caf27f9076
2011-12-16 03:59:26 -08:00
Jeff Brown
99cfc22639 Raise default connection pool size.
Bug: 5763266
Change-Id: I8460c942ef882ea747d2b5756c708fce2849de93
2011-12-16 03:59:25 -08:00
Joe Onorato
44fcb83b38 Add a new ui mode for "appliance"
The idea is that this is a device which is more-or-less headless.  It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.

Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
2011-12-15 16:16:14 -08:00
Jeff Sharkey
27c751dc00 Merge "Restrict app data on metered networks." 2011-12-15 15:37:21 -08:00
Jeff Sharkey
f60d0afd1e Restrict app data on metered networks.
This separates the definition of "metered network" and "network with
limit."  For now, all mobile networks are considered metered.

Bug: 5571454
Change-Id: I394cd385bd33add75e53bfc9cf2fefd06a00208a
2011-12-15 14:30:04 -08:00
Marco Nelissen
18cb28756c Add ContentProvider.dump()
This is similar to the existing dump() facility for services.
ContentProviders can now implement dump() and that info will be shown
when running "dumpsys activity provider" and when taking a bugreport.

Change-Id: I33b3b132e3c4f920153355cc368eda2f725a715f
2011-12-15 12:13:59 -08:00
Jeff Sharkey
56381b5481 Merge "Clear reply before writing exception." 2011-12-15 11:51:32 -08:00
Martijn Coenen
cb1b2b8b1e Merge "Fix NPE on mock NDEF tech operations." 2011-12-15 10:32:11 -08:00
Martijn Coenen
23fc93a7c1 Fix NPE on mock NDEF tech operations.
Change-Id: Ib67bd03b6275fdb86a5d6dedc6c7e4fed07ef8b0
2011-12-15 10:28:52 -08:00
Victoria Lease
3c65fad4de Merge "URL-decode tel: URIs." 2011-12-15 09:59:42 -08:00
Steve Block
92f30c3d5f Fix AppCache when either no path or an invalid path is supplied
The bulk of the change is in to external/webkit:
https://android-git.corp.google.com/g/155448

This part of the change simply adds some optimizations to avoid syncing to
native when not required, and cleans up the JavaDoc.

Bug: 5745181
Change-Id: I0009c1868755fe211ec2dc31bd007d393aabfbe3
2011-12-15 17:46:21 +00:00
Jesse Wilson
8543b5480d Give a reflection example for installing the HTTP response cache.
From the Android developers blog,
http://android-developers.blogspot.com/2011/09/androids-http-clients.html

Change-Id: Iff0a06fb7b0b8c085b9f16e85b30db44c889235e
2011-12-15 12:25:55 -05:00
Romain Guy
18ca25be58 Merge "Generate even fewer GL commands" 2011-12-14 19:25:20 -08:00
Romain Guy
8f85e80b64 Generate even fewer GL commands
Change-Id: I0f4dcacb03ef5ee7f6ebd501df98bfead5f0a7f8
2011-12-14 19:23:32 -08:00
Dianne Hackborn
51a0e745ee am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1
* commit '13299a33e14562a5de14c89ad058d28ab0cd9f37':
  Fix some java docs.
2011-12-14 18:21:29 -08:00
Jeff Sharkey
7f97e65add Clear reply before writing exception.
Changes Binder.execTransact() to clear any partial reply before
writing the exception.  Specifically, this fixes case where an
onTransact() could leave a writeNoException() floating in the reply.

Bug: 5686023
Change-Id: Ibc944464a010f5ec2fd8ef3cc84ac23d8260a491
2011-12-14 18:07:54 -08:00
Glenn Kasten
25adf47477 Merge "Fix indentation and whitespace" 2011-12-14 17:35:36 -08:00
Dianne Hackborn
251fe26375 Fix some java docs.
Change-Id: I0eeba6f9108db74418063fba522ed3ef1c27ae95
2011-12-14 17:20:54 -08:00
Victoria Lease
4d8ea3bcc6 URL-decode tel: URIs.
bug: 5688406

Change-Id: I2e3906c22d02b6333ccad7dba529d44ae572a368
2011-12-14 17:13:47 -08:00
Glenn Kasten
fb2ab9efc3 Fix indentation and whitespace
Use git diff -w to verify.

Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
2011-12-14 16:54:05 -08:00
Jaikumar Ganesh
ec62f12a94 Merge "Change the fd to be blocking for health profile." 2011-12-14 15:25:25 -08:00
Brian Colonna
4c1920c98a Merge "Added Face Unlock to tablet lockscreen layouts" 2011-12-14 14:14:24 -08:00
Gilles Debunne
545c4d4438 Rationalize blinking cursor test.
Moved full test into shouldBlink() to make the condition consistent.

Change-Id: Id8abf38e180e1a00eb132476f102361f0feb56da
2011-12-14 14:12:13 -08:00
Jaikumar Ganesh
82477b5e3c Change the fd to be blocking for health profile.
This is sync with the java IO stream APIs for the public APIs.

Change-Id: I5c7958687275d89257ac26f6a5abd08906327d02
2011-12-14 14:00:44 -08:00
Fabrice Di Meglio
54b9f98417 Merge "Fix bug #5674155 Segmentation issue for Thai" 2011-12-14 13:47:00 -08:00
Jeff Sharkey
17b2890487 Merge "Avoid reading network stats when disabled." 2011-12-14 10:12:17 -08:00
Tom Taylor
affa29ac50 Received MMS is not displayed properly with 'Avea' SIM Card
Bug 5729514
Hand merge a patch from Samsung to fix:
"From Avea server the subject and length in MMS coming like as "...96 00...".
 It means subject header present but subject length is zero.
 As per accepted principles of MMS headers, if the header length is zero it should not be sent.
 Android framework code does not handle this siutation and parsing fails always."

Change-Id: I930aa1e97f5e2e6eb69a94b7380c114272330232
2011-12-14 09:45:04 -08:00
Fabrice Di Meglio
a4d0770063 Fix bug #5674155 Segmentation issue for Thai
- force Harfbuzz to shape with the Thai font

Change-Id: I3830acae17385b050e2745fca277cf66af103099
2011-12-13 18:52:13 -08:00
Fabrice Di Meglio
a9960076ef Merge "Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B" 2011-12-13 18:43:04 -08:00
Fabrice Di Meglio
65194adc9a Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B
- force Harfbuzz to shape with the Bengali font
- also fix potential returned NULL value from SkTypeface::CreateFromFile(path)

Change-Id: I25be09d06e449b89bb4a62444e27f77e436b77ba
2011-12-13 18:14:49 -08:00
Dianne Hackborn
b5052de757 resolved conflicts for merge of a80bab37 to master
Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef
2011-12-13 16:31:43 -08:00
Gilles Debunne
6e87ecbb1d am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
* commit '2450b36a3696bc5afdf2a0f2af8b2008efb8a7b0':
  Do not spell check the foreground ExtractEditText.
2011-12-13 15:59:26 -08:00