27432 Commits

Author SHA1 Message Date
John Reck
c9c76a82c6 Merge "Fix Apache stack" 2012-01-04 10:52:35 -08:00
Steve Block
41891aeaf4 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE" 2012-01-04 10:13:13 -08:00
John Reck
430b1b9b3c Fix Apache stack
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
2012-01-04 09:49:17 -08:00
Jesse Wilson
7c48707a9d Merge "Explicitly specify 'milliseconds' as alarm manager's time unit." 2012-01-04 08:22:36 -08:00
Steve Block
7b061309fa Merge "Fix AppCache when either no path or an invalid path is supplied" 2012-01-04 05:36:57 -08:00
Elliott Hughes
6746499f12 Fix Music import for Turkish locales.
For non-localized strings like the keywords in SQL statements, we shouldn't use
locale-specific case transformations.

(Cherry pick of 03f8f84c345e7c861a6de889d434b9d82cf04c8d.)

Bug: 4284951
Change-Id: Ib5180daf7892af7b645c906fdfeacf9da87bd667
2012-01-03 17:20:38 -08:00
Steve Block
5baa3a62a9 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
2012-01-03 22:38:27 +00:00
Danielle Millett
3c673732ea Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock" 2012-01-03 13:44:28 -08:00
Brian Colonna
dd13756fdc Merge "Added padding to PIN layout status and carrier text" 2012-01-03 13:43:07 -08:00
Ben Murdoch
2853041e6a Merge "Do not allow file:// access when it is disabled." 2012-01-03 02:53:58 -08:00
Eric Fischer
40da0486f8 Merge "Import revised translations." 2011-12-29 14:46:50 -08:00
Eric Fischer
6f32f87717 Import revised translations.
Change-Id: Idaec3a909e2edb46d7f3409947c8329210befcae
2011-12-29 11:46:43 -08:00
Irfan Sheriff
7db0d04112 Merge "Add multi-interface support to native calls" 2011-12-29 09:11:29 -08:00
Irfan Sheriff
2f0d941b5d Merge "clean up jni code" 2011-12-28 13:55:19 -08:00
Irfan Sheriff
44b330dfb0 Add multi-interface support to native calls
Add the initial support for supporting seperate socket
connections on the p2p interface.

This is the initial change making primary interface connections
work alongside native support for p2p socket connection

Change-Id: I7619715ca75b10afd29af852279fe713331f75e0
2011-12-28 13:25:14 -08:00
Irfan Sheriff
1f09586953 clean up jni code
- Move all supplicant commands out of jni code in preparation for multi-socket
changes

- Also, clean up some function names to remove the explicit command

Change-Id: Id609ac7df0792fb85b52554d159f22064227c584
2011-12-28 13:18:07 -08:00
Jesse Wilson
52cd299eef Move the frameworks/base hostname verifier into libcore. Part 2/2
Bug: http://b/5619726
Change-Id: I165eb3befcef104ff56ffb466c87c60b632f3194
2011-12-27 19:00:56 -05:00
Jesse Wilson
79074cd935 Explicitly specify 'milliseconds' as alarm manager's time unit.
Change-Id: Ic247c1a17283f7b1aa51cae8a2b43e987208aa8a
2011-12-22 22:51:37 -05:00
Joe Fernandez
2b07267753 am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit '201469f54522436be79d4d6665721049bfc74320':
  docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:59:34 -08:00
Joe Fernandez
3aef8e1d1b docs: Add developer guide cross-references, Project ACRE, round 4
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
2011-12-22 15:08:23 -08:00
Danielle Millett
2364a222fc Fix 5783857: Device Policy Manager doesn't allow Face Unlock
This makes it so that if face unlock is enabled and then a device policy
manager that requires something more secure than face unlock is installed,
the user will be forced to choose a new acceptable lock type.

This was previously fixed for the case where the device had been reset, or
the shell was restarted after setting face unlock, but not for the case where the
device remained on between setting face unlock and setting up a device policy
manager.

Also changed the function ordering of saveLockPattern() so that the overloaded
wrapper function is next to the main function.

Change-Id: Ibed8c4ab137ebbc07fb143faef6f047bc6dc4474
2011-12-22 10:00:44 -05:00
Jonathan Dixon
a46c16c3b6 Merge "Fix silly comment order error" 2011-12-22 06:30:50 -08:00
Brian Colonna
de4eb8e968 Added padding to PIN layout status and carrier text
When using a PIN backup method, Face Unlock was touching the bottom of
the status text on the top and the top of the carrier text on the
bottom, which made it look crowded and bad.

4 dips of padding was added to the bottom of the status text and
another 4 dips was added to the top of the carrier text.  This
corresponds to 8 pixels on the prime and 6 pixels on the crespo.  The
effect of this is that the keypad is 6 pixles closer to the entry text
on the crespo and 8 pixels closer to the entry text on the prime.  On
crespo, the keypad and entry text views are now as close as possible
when examining the pixel locations, but visually there is still space
between them and the difference is hardly noticable to the eye.

Despite the small change, Face Unlock looks a lot better when it is
not literally touching the text.

Change-Id: I01a7a6ace4789232595c5aa7683c1342ebbb2ee2
2011-12-21 13:59:31 -05:00
Jonathan Dixon
02630bfe40 Fix silly comment order error
Incorrectly resolved rebase of my previous two commits...

Change-Id: Ie778774deb7ee0979568ca0a8963db2d72bc7a1a
2011-12-21 18:47:57 +00:00
Chet Haase
0f933c9a32 Merge "Fix behavior of AnimationSet and fillBefore" 2011-12-21 07:53:14 -08:00
Jonathan Dixon
e230e54f09 Minor WebView docs improvement
Change-Id: Ib0389be456755fac24ad130edd0dd091d9acfaae
2011-12-21 13:05:27 +00:00
Chet Haase
0041861a04 Fix behavior of AnimationSet and fillBefore
The previous logic in AnimationSet when starting an animation
ignored the fillBefore behavior of its child animations. This caused
a bug where a delayed AlphaAnimation would automatically cause the
target view to become transparent, even though it was supposed to wait
until after some delay to do so.
The fix checks the fillBefore behavior of each child animation before
concatenating its transform with the transform of the AnimationSet.

Change-Id: I76a2dafbe6dd338dc5281b17612eae87af168d86
2011-12-20 15:56:15 -08:00
Chet Haase
7d4045b3f2 Merge "Make behavior of ABSOLUTE pivot values more intuitive" 2011-12-20 10:49:02 -08:00
Gilles Debunne
cd76a4da3e Merge "Rationalize blinking cursor test." 2011-12-20 10:46:42 -08:00
Chet Haase
84c949f3b1 Make behavior of ABSOLUTE pivot values more intuitive
Currently, you must call initialize() on RotateAnimation or
ScaleAnimation prior to calling start(). The reason is that the
actual pivot point used in calculating the transform is not set
until that method is called. This makes sense in the typical case
where the animation is running on a View and is using values relative
to the size of the View or of its parent. But if the caller sets the
values to be ABSOLUTE types instead, the sizes of the view and the parent
are irrelevant and the call to initialize() should not be needed (and
is not intuitive).

This fix automatically sets the internal pivot values in the case where
the value types are ABSOLUTE.

Change-Id: I74a0e462486efae08aa76e72c0d19d82f2a2677e
2011-12-20 10:38:31 -08:00
Chet Haase
cf701add24 Merge "Fix ViewAnimator.getDisplayedChild() bug" 2011-12-20 10:37:14 -08:00
Chet Haase
fdeeba9608 Merge "Minor small fixes to old Animation code and docs." 2011-12-20 10:36:55 -08:00
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
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