65086 Commits

Author SHA1 Message Date
The Android Open Source Project
e4f0034226 am 21cb1290: Reconcile with ics-mr1-release
* commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':
2011-12-20 13:11:53 -08:00
The Android Open Source Project
21cb1290b5 Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
2011-12-20 13:08:33 -08:00
Alex Sakhartchouk
c9e7da6130 Adding simple hal struct to type.
Fixing off by 1 error in the element.

Change-Id: I0b142942c760cb861007af7099d35d0363f4e13b
2011-12-20 12:37:59 -08:00
Chet Haase
5e22320f58 am 7d4045b3: Merge "Make behavior of ABSOLUTE pivot values more intuitive"
* commit '7d4045b3f2c520ffb9db2b6562c9e04fa234407f':
  Make behavior of ABSOLUTE pivot values more intuitive
2011-12-20 10:52:13 -08:00
Gilles Debunne
5aa9639d3f am cd76a4da: Merge "Rationalize blinking cursor test."
* commit 'cd76a4da3e95ae213b6a25418f43ff57d905ce2e':
  Rationalize blinking cursor test.
2011-12-20 10:49:55 -08:00
Chet Haase
7d4045b3f2 Merge "Make behavior of ABSOLUTE pivot values more intuitive" 2011-12-20 10:49:02 -08:00
John Wang
0037c8c712 am d02c5dfd: am c0139281: am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'd02c5dfd8dac526ec3c74e2c160835aa2c9d19c9':
  Hide emergency call text if not support it.
2011-12-20 10:47:46 -08:00
Gilles Debunne
cd76a4da3e Merge "Rationalize blinking cursor test." 2011-12-20 10:46:42 -08:00
John Wang
d02c5dfd8d am c0139281: am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'c01392816fbb16ca76c738bc801f3b2c34548c06':
  Hide emergency call text if not support it.
2011-12-20 10:45:32 -08:00
John Wang
c01392816f am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'c892e177c4f7a41e910c70f68d4e213589da1396':
  Hide emergency call text if not support it.
2011-12-20 10:43:13 -08:00
John Wang
c892e177c4 Merge "Hide emergency call text if not support it." into ics-mr1 2011-12-20 10:41:08 -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
bd4a653a4e am cf701add: Merge "Fix ViewAnimator.getDisplayedChild() bug"
* commit 'cf701add24c2b598fd25f20e6cb0c6766b8e3be6':
  Fix ViewAnimator.getDisplayedChild() bug
2011-12-20 10:38:22 -08:00
Chet Haase
a2a080f403 am fdeeba96: Merge "Minor small fixes to old Animation code and docs."
* commit 'fdeeba9608257561b198743b369ea3be7aa28509':
  Minor small fixes to old Animation code and docs.
2011-12-20 10:38:20 -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
Glenn Kasten
d83eadaacc am bdb0cee0: Merge "Remove dead code"
* commit 'bdb0cee0efc7e99aff05673e69cd5c716aec9117':
  Remove dead code
2011-12-20 10:31:06 -08:00
Glenn Kasten
bdb0cee0ef Merge "Remove dead code" 2011-12-20 10:29:49 -08:00
Tom Taylor
603e0bec0c am e593ea10: Merge "Received MMS is not displayed properly with \'Avea\' SIM Card"
* commit 'e593ea103e78f144ac01b40fd818079d42f0827c':
  Received MMS is not displayed properly with 'Avea' SIM Card
2011-12-20 10:17:02 -08:00
Tom Taylor
e593ea103e Merge "Received MMS is not displayed properly with 'Avea' SIM Card" 2011-12-20 10:15:26 -08:00
Fredrik Roubert
da6aedf716 Test the correct return code from call to cryptfs.
This was broken in commit dd519fac9b79f36a27909149a90fce4321ed1c20
(certainly by mistake), in which Integer.parseInt(tokens[1]) was
errornously replaced with event.getCode().

Change-Id: Ic5af5a2ec5f321da21a4a5db25f6908462f6cae8
2011-12-20 18:47:33 +01: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
40605dd5b6 am 9cfff10b: Merge "Remove misleading API council comments"
* commit '9cfff10bf5266f5bda99d2e3cbbc19c046924dc8':
  Remove misleading API council comments
2011-12-20 08:19:56 -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
Chet Haase
35afa3d1c3 am f3bd2f7a: Merge "Fix AnimationDrawable double-start bug"
* commit 'f3bd2f7a3f2eadd5126b1a55ca45bdbffe80ceeb':
  Fix AnimationDrawable double-start bug
2011-12-19 18:04:21 -08:00
Chet Haase
f3bd2f7a3f Merge "Fix AnimationDrawable double-start bug" 2011-12-19 18:02:23 -08:00
Bill Gruber
641ffc0323 am 8af76c99: am c296892a: am 1d56f41c: Doc Fix: Sensors and Cameras
* commit '8af76c99d8747bb61314cb3041202920f3bd2237':
  Doc Fix: Sensors and Cameras
2011-12-19 17:49:36 -08:00
Bill Gruber
8af76c99d8 am c296892a: am 1d56f41c: Doc Fix: Sensors and Cameras
* commit 'c296892aa2dee5f9e0fee376a2b97a4fa06f3f88':
  Doc Fix: Sensors and Cameras
2011-12-19 17:47:21 -08:00
Bill Gruber
c296892aa2 am 1d56f41c: Doc Fix: Sensors and Cameras
* commit '1d56f41c9d1dcccf1faef343047375cb14799678':
  Doc Fix: Sensors and Cameras
2011-12-19 17:45:24 -08:00
Bill Gruber
1d56f41c9d Doc Fix: Sensors and Cameras
Change-Id: I964a06e5224e59f3098f4d316db4d3b119a05a88
2011-12-19 17:32:47 -08:00
Eric Laurent
be0a22530b am 0ca16d6b: Merge "audio effects: rename configure command"
* commit '0ca16d6ba6a2e952bf39961abd7c6f720871ef01':
  audio effects: rename configure command
2011-12-19 17:28:09 -08:00
Eric Laurent
0ca16d6ba6 Merge "audio effects: rename configure command" 2011-12-19 17:26:24 -08:00
Eric Laurent
4abf88244b audio effects: rename configure command
Renamed audio effect library interface command for audio format
configuration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG.
This makes the naming more consistent with other exixsting commands
and allow adding a new command to get the configuration (EFFECT_CMD_GET_CONFIG).
Same change for reverse channel configuration renamed from
EFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE.

Implemented EFFECT_CMD_GET_CONFIG in exisitng effect libraries.

Change-Id: Ia7b1c620f13797fe5aceb3b0b4acbacce09fb067
2011-12-19 17:08:31 -08:00
Nick Pelly
c0d33d0b47 am 5f45cbac: Fix build break - move API change from 15.txt to 16.txt
* commit '5f45cbac03aef1aaa4e6947c3a1188768343686a':
  Fix build break - move API change from 15.txt to 16.txt
2011-12-19 16:54:22 -08:00
Nick Pelly
5f45cbac03 Fix build break - move API change from 15.txt to 16.txt
Change-Id: I3e7e2106424e00d696909c811ffe704ca8bffced
2011-12-19 16:51:45 -08:00
Irfan Sheriff
bfed2d6c61 p2p fixes
- Change default GO intent to 7
- Handle P2P invitation scenario
- Fix p2p STA connect notification handling to figure device address. Proper fix
for handling both STA connection and disconnection is after we update supplicant

Change-Id: I9ff82f84ad3913905952d1119b7224dff41c24d9
2011-12-19 16:25:53 -08:00
Glenn Kasten
31ba2e5541 Remove dead code
Change-Id: Icf23f7f90fdeb660f4015f22cf239e6d05f5d03c
2011-12-19 15:55:47 -08:00
Nick Pelly
b8048c9991 am eca6d909: Merge "Rewrite NDEF parsing in Java, clean-up API."
* commit 'eca6d909f7dd990c9a3226aa2f1ed1fa0cd250a2':
  Rewrite NDEF parsing in Java, clean-up API.
2011-12-19 15:54:37 -08:00
Nick Pelly
eca6d909f7 Merge "Rewrite NDEF parsing in Java, clean-up API." 2011-12-19 15:53:10 -08:00
Chet Haase
f7917e656b Fix AnimationDrawable double-start bug
AnimationDrawable.setVisible(true, true) was not correctly recording
the fact that it had started the animation, so it was possible to call
start(0 immediately afterwards and have two animations running on the
drawable in parallel, resulting in incorrect frame ordering.

Issue #5782773

Change-Id: Ifc328f755a51d10ab76b84006d1999df03d2dca1
2011-12-19 15:49:42 -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
Brian Colonna
fb45f7b08b Unbinding from FU when going to backup
Lockscreen was stopping Face Unlock when going to the backup lock, but
not unbinding from the Face Unlock service until the device was
unlocked.

This caused a bug on the tablets where Face Unlock would reappear when
switching between portait and landscape orientations, even after the
backup lock was exposed.  On an orientation change, Face Unlock is
restarted if the service is bound to during the orientation change.
Since it was bound to when it should not have been, Face Unlock was
restarting when it should not have been.

The wakelock is also now being poked on an orientation change because
on the tablet you can keep Face Unlock alive by switching the
orientation back and forth, but eventually the screen would go dark
with Face Unlock running.

Also, a conditional was moved in activateFaceLockIfAble() so the whole
section isn't executed if Face Unlock is not in use.  Part of it was
being executed with only the inner-most part having the check.  This
did not cause any issues that I am aware of.

Change-Id: Ib452b8ced28a507bf9272dbf5d3477a8abd1ba90
2011-12-19 15:51:10 -05:00
Alex Sakhartchouk
8c998cf344 Merge "Adding comments to RS headers." into graphics-dev 2011-12-19 10:12:27 -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
Bart Sears
342de24f3e am 01583ef7: Merge "Add glyphs for Vertical Text"
* commit '01583ef715641c8a3ce68269b091e75adbe9335a':
  Add glyphs for Vertical Text
2011-12-18 15:41:08 -08:00
Bart Sears
01583ef715 Merge "Add glyphs for Vertical Text" 2011-12-18 15:38:59 -08:00
Scott Main
98ac76f7aa am e0481620: am 3204c523: am 8f04ae36: docs: fix sidenav typo
* commit 'e0481620ea88cb8ae71ba74b1417736e8b04f043':
  docs: fix sidenav typo
2011-12-18 14:07:31 -08:00
Scott Main
e0481620ea am 3204c523: am 8f04ae36: docs: fix sidenav typo
* commit '3204c52377ca508709cb66b24398af58ca32efdd':
  docs: fix sidenav typo
2011-12-18 14:05:23 -08:00
Scott Main
3204c52377 am 8f04ae36: docs: fix sidenav typo
* commit '8f04ae361cd34fdaea41fbedefb85cff2c684e36':
  docs: fix sidenav typo
2011-12-18 14:03:30 -08:00