61344 Commits

Author SHA1 Message Date
Guang Zhu
5eefd7711f add a self instrumentation into framework perf app
It's essentially a test app on itself to facilitate
running the perf automatically.

Change-Id: I5aad3565e64719d219e76969a989ca80aa6df286
2011-11-17 15:26:36 -08:00
Matthew Xie
302afb93d4 Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 2011-11-16 18:20:50 -08:00
Mathias Agopian
1125f89e47 Merge "remove hack that hardcoded the refresh rate" into ics-mr1 2011-11-16 18:19:33 -08:00
Mangesh Ghiware
4fdfdeedc6 Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
satok
e5febfd5bd Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Matthew Xie
0901e601b5 Call notifyIncomingA2dpConnection with correct rejected status
notifyIncomingA2dpConnection was called with wrong rejected status.
Fix this.
bug 5626476

Change-Id: Ie8e4a8bdc6f6357a62172c86c21ee547376952a4
2011-11-16 17:14:36 -08:00
Daniel Sandler
f52a4482dd Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Daniel Sandler
5311917df5 Merge "Remove day of week from phone notification panel." into ics-mr1 2011-11-16 17:13:16 -08:00
satok
060677f468 Clean up the spell checker framework
Change-Id: I64c0d813e53a4ebf8d7e63463e36f6900f1aa7d3
2011-11-17 09:40:56 +09:00
Mathias Agopian
69c17a11a2 Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 2011-11-16 16:13:38 -08:00
Mathias Agopian
db5494c406 Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450
2011-11-16 15:59:13 -08:00
Marco Nelissen
e937da8314 Merge "Change MediaController look b/5584613" into ics-mr1 2011-11-16 14:54:20 -08:00
Dianne Hackborn
717a25dc2a Add new ManagedEGLContext class to help apps participate in memory trimming.
This class provides an API for an application to know when it is time to
destroy its EGL context when memory is being trimmed.  By having this in
the framework, we can still detect whether it will be useful to destroy
any EGL contexts (because we know if doing so will destroy all of them).

Change-Id: I1eac8d640052778052926b875c7928008f752182
2011-11-16 14:04:53 -08:00
Dianne Hackborn
4c6a65bc31 Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 2011-11-16 14:03:09 -08:00
Marco Nelissen
cbd4bcaa71 Change MediaController look
b/5584613

Change-Id: I6799753ffff3202e354039b85fdca72e48e6be5d
2011-11-16 13:43:11 -08:00
Mangesh Ghiware
e832b63c97 Revert change to setInitialScale() to take display density into account.
Updated WebView documentation to clarify this behavior.

Additionally, if target-densityDpi is specified in the meta viewport
tag, update the display density in ZoomManager.

Bug: 5477652
Bug: 5327492
Change-Id: I176e87489f76a2ee6595d76a006e302b07595de1
2011-11-16 13:31:56 -08:00
Dianne Hackborn
ee9aef0b42 Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
...through setup wizard after wipe data

Deal with finish() being called when there are no running activities
on the stack.

Also some improved debugging output.

Change-Id: Ia1d3f3f7e7b79c06ca95c738081322fc80282e0d
2011-11-16 13:21:46 -08:00
Robert Greenwalt
33fe4a36b7 Merge "Fix TelephonyManager to grab the best context" into ics-mr1 2011-11-16 12:06:53 -08:00
Robert Greenwalt
8f4f814beb Fix TelephonyManager to grab the best context
It may not be called from an app so the app context may not exist.
Check and grab the best one.
Also remove the log that nobody paid attention to if the constructor
is called again from the same process.  One context seems to be as
useful as another.

bug:5572369
bug:5622514
Change-Id: Iad23b30c7c8fe5b8d1f81a1e060eaf0cd0e3019d
2011-11-16 11:36:08 -08:00
Jamie Gennis
fd6b64f6ad Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 2011-11-16 11:34:30 -08:00
Eric Fischer
7dc81e06e4 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:57:45 -08:00
Gilles Debunne
de8c5ec889 Merge "IME action (done, next...) correctly handled" into ics-mr1 2011-11-16 10:31:40 -08:00
Eric Fischer
2f8e2e805d Import revised translations. DO NOT MERGE
Change-Id: I4ef67d81f61028da84c51ed0e48231f9cdc62679
2011-11-16 09:55:52 -08:00
Alex Sakhartchouk
4c593010dd Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 2011-11-16 09:40:11 -08:00
Fred Chung
15fe377c7c Merge "Bluetooth HDP sample." into ics-mr1 2011-11-16 09:31:54 -08:00
The Android Open Source Project
816e68e2fd No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
2011-11-16 09:28:00 -08:00
The Android Open Source Project
d28bb28e08 Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
2011-11-16 08:55:43 -08:00
Gilles Debunne
efbad5fb90 IME action (done, next...) correctly handled
Bugs 5599728 and 5319237.

mInputContentType should be set for a "modern" cupcake
environment says a comment in TextView.

However, it is possible to call onEditorAction on a
TextView that didn't use any of the method that lazily
create that field. This is for instance achieved using
the extracted mode in landscape (Done, Next actions)
or in Contacts, that feature a Next/Done button in the
IME.

As a result, the action is ignored.

The patch is to force the creation of the mInputContentType
when the EditText is associated to the IME.

Change-Id: I5beec5a52e9eec0c209af37d68791bb6ff83d6f6
2011-11-16 17:38:48 +01:00
The Android Open Source Project
c740325852 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
2011-11-16 07:33:59 -08:00
Mathias Agopian
f98ab8b140 remove hack that hardcoded the refresh rate
Change-Id: Ibdd40b337c547e80ef8541856015f1380c8d58ed
2011-11-16 00:08:08 -08:00
Daniel Sandler
c224f76303 Add a default Dreams component.
Currently set to DeskClock's screensaver, but since it's a
(private) string in f/b/c/r/r/values/config.xml any product
could overlay this.

Bug: 5611008
Change-Id: I7a4623c9c667a6cff8ed80ad600a8a4460bfafb7
2011-11-15 22:55:03 -08:00
Daniel Sandler
589f3624e0 Remove day of week from phone notification panel.
It was added to the tablet, but was never intended for use
on the phone, where it can cause the label to get too wide,
preventing access to settings / clear-all.

Bug: 5621955
Change-Id: Ic023391aa22d7ba3edd815f602afcb3357eb2501
2011-11-15 21:28:55 -08:00
Jake Hamby
bd7836846c am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
  Fix 3GPP SMS send failure for 7-bit national language tables.
2011-11-15 20:16:12 -08:00
Bill Gruber
c7b354810e am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
  IAB Doc Fix: Error in code snippet Bug 5221766
2011-11-15 20:16:02 -08:00
Adrian Ludwig
cbc96549c9 am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
  Adding new "Security Best Practices" to the html docs.
2011-11-15 20:15:57 -08:00
James Dong
4fdc36e6d6 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Adam Powell
45f05c9580 Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 2011-11-15 19:51:56 -08:00
Jeff Brown
3e7497b4ec Merge "Eliminate hw.keyboards system properties." into ics-mr1 2011-11-15 19:17:09 -08:00
The Android Automerger
dd701b84aa merge in ics-mr0-release history after reset to ics-mr0 2011-11-15 19:08:44 -08:00
Adam Powell
29ea525d18 Fix bug 5623642 - Status bar background incompatible with some legacy apps
Give some background protection to custom layouts in legacy notifications.

Pre-HC it was extremely common for apps to hardcode text colors in
layouts. Since this can lead to black text on a dark background in
HC/ICS, give these older apps that target SDK < 11 a light gray
background.

Change-Id: Iab3dea4beb9172b2f9a5cae53991cf952d0c8cde
2011-11-15 19:04:33 -08:00
Dianne Hackborn
cdec187a27 Merge "Whoops, need to acquire lock." into ics-mr1 2011-11-15 19:04:11 -08:00
Jean-Michel Trivi
0ddb014389 Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 2011-11-15 18:19:34 -08:00
Mathias Agopian
c0fa2a3bce Merge "rework a bit how we manage EGL extensions" into ics-mr1 2011-11-15 18:12:00 -08:00
James Dong
89ca6983eb Document that release() should be called with onPause() and onStop() for media objects
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
2011-11-15 18:08:06 -08:00
Jeff Brown
1e08fe90df Eliminate hw.keyboards system properties.
Stop using system properties to publish information about
the key character map path.  Instead, we can retrieve it
on demand by asking the window manager.

It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.

Bug: 5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
2011-11-15 18:00:10 -08:00
Jean-Michel Trivi
e7edc86853 Fix 5623252 unlink to death of audio focus client early
When removing an entry in the audio focus stack, don't wait for
 this object's finalizer to unlink to the death of the associated
 client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
 by catching the exception it can throw inside its body.

Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
2011-11-15 17:41:05 -08:00
Dianne Hackborn
7aa6d31240 Whoops, need to acquire lock.
Also increase time between reports to try to reduce the amount
of redundant spam we get.

Change-Id: Iedd7d743826fffa62ee431073cb7dfb49a00cea0
2011-11-15 16:12:30 -08:00
Jim Miller
c57bfa4a4b Fix 5581164: Add abbreviated localized date strings
Change-Id: I041eef02a67980d3b5c2f2fa12eae717c26e35be
2011-11-15 16:06:37 -08:00
Jim Miller
34a62348be Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 2011-11-15 15:42:20 -08:00
Tsu Chiang Chuang
cce32110e6 am d5897dc7: fix for build breakage.
* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
  fix for build breakage.
2011-11-15 15:00:26 -08:00