57638 Commits

Author SHA1 Message Date
Jeff Brown
9bd23e2568 am a2bc2d25: Merge "Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301"
* commit 'a2bc2d2569e52dccb8df8fa73b9557e465113aab':
  Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301
2011-08-25 11:29:51 -07:00
Jason Simmons
df6bb0a7ee resolved conflicts for merge of 33264596 to ics-aah
Change-Id: I1b0b2c3a63d97d49940666ceec71293bdbab4e2e
2011-08-25 09:57:48 -07:00
Mike J. Chen
cbb8b45088 Add the ability to pass float extras to AM.
Merged from master-tungsten:

commit 43a2825a283e29c0f70100146394957af0598b0e
Author: John Grossman <johngro@google.com>
Date:   Wed Apr 27 09:03:53 2011 -0700

    Add the ability to pass float extras to AM.

    Change-Id: I970ad3f76a65bd781099204019095c73ed8c09db

Change-Id: I4ab21f20da4529069479bc822ed20aa05d161357
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-08-24 18:37:50 -07:00
Dan Morrill
641b17a3df Adding a feature to indicate specific support for Bluetooth API.
Change-Id: I0e2dc3037c91710eb8b9409bab57750498333cef
2011-08-24 15:12:42 -07:00
Jeff Brown
a2bc2d2569 Merge "Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301" 2011-08-23 18:33:42 -07:00
Dianne Hackborn
332645960c Merge "Fix issue #4279860: previous UI flashes before showing lock screen..." 2011-08-23 18:13:51 -07:00
James Dong
623c07e1fb am a8120ea3: Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
* commit 'a8120ea311e298b61902b947a35876c173417770':
  To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.
2011-08-23 18:08:15 -07:00
James Dong
a8120ea311 Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams." 2011-08-23 18:06:16 -07:00
Jeff Brown
ea6892e02e Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER.
Bug: 5205301

Some drivers report one finger as BTN_TOOL_FINGER, two as
BTN_TOOL_DOUBLETAP, three as BTN_TOOL_TRIPLETAP and four
as BTN_TOOL_QUADTAP.  Since we care about the tool type,
we need to handle _DOUBLE/_TRIPLE/_QUAD tap in the same way
we handle _FINGER.

Change-Id: I8eb83d2a2bada9ac32d07619c7eea84e924316b8
2011-08-23 17:49:49 -07:00
Dianne Hackborn
29aae6f36e Fix issue #4279860: previous UI flashes before showing lock screen...
...(when turning display on after recently turning it off)

Also clean up when we decide to turn the screen on to improve that
transition.  There are still problems here with turning it on
before the wallpaper gets dispayed.

Change-Id: I2bc56c12e5ad75a1ce5a0546f43a845bf0823e66
2011-08-23 17:44:52 -07:00
Adam Powell
d44b0df105 am 0e1e5223: Merge "Fix bug 5149918 - Can\'t call ProgressDialog.setProgressNumberFormat() before dialog is shown"
* commit '0e1e5223f96250e84323ae95d8cc9bd474b93502':
  Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat() before dialog is shown
2011-08-23 17:13:50 -07:00
Adam Powell
0e1e5223f9 Merge "Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat() before dialog is shown" 2011-08-23 17:11:33 -07:00
Adam Powell
5d4faa91f7 Fix bug 5149918 - Can't call ProgressDialog.setProgressNumberFormat()
before dialog is shown

Change-Id: I287637e022fb653f02b45b34075eccb68e4a9221
2011-08-23 16:52:35 -07:00
Justin Ho
0ca4252363 am 5b56f7d6: Merge "Updated spinners Bug: 5076695, 5165156"
* commit '5b56f7d6f662a543d0432a46047a55f1ee900994':
  Updated spinners Bug: 5076695, 5165156
2011-08-23 16:51:37 -07:00
Justin Ho
5b56f7d6f6 Merge "Updated spinners Bug: 5076695, 5165156" 2011-08-23 16:49:55 -07:00
Justin Ho
a34b06309e Updated spinners
Bug: 5076695, 5165156

Change-Id: I5613d03806ddf27742509e32b4050733ba45dbfb
2011-08-23 16:44:55 -07:00
Christopher Tate
9144056992 am 60ce25b3: Merge "Warn only if we\'re tearing down "live" DeathRecipient content"
* commit '60ce25b34dd3f7c1dadade9ec8769f17b12c39a6':
  Warn only if we're tearing down "live" DeathRecipient content
2011-08-23 16:44:51 -07:00
Christopher Tate
60ce25b34d Merge "Warn only if we're tearing down "live" DeathRecipient content" 2011-08-23 16:43:30 -07:00
Christopher Tate
2611f89ab4 Warn only if we're tearing down "live" DeathRecipient content
If the native-side bookkeeping still has strong references to VM-side
DeathRecipient objects at the time when it's being torn down, that
suggests that the app is doing unwholesome.  Log a warning to that
effect, with the class name of the objects to try to help the developer
figure out what they're mishandling.

Fixes bug 5202777 -- in particular, it no longer logs in the
working-as-intended case following delivery of the death notices,
when we've got the existing list shell but the weak refs have properly
cleared.  Also step down from "error" to "warning" logging as befits
the nature of the actual situation now being described.

Change-Id: Ic393560824800fbd912a6e69692c65be4fcc7544
2011-08-23 16:26:57 -07:00
Chet Haase
6aa0ae71a1 am 09d569a5: Merge "Fix invalidation roundoff error with old animations"
* commit '09d569a57e7c8f3d8d6a5f2204643988ae36e07c':
  Fix invalidation roundoff error with old animations
2011-08-23 15:55:41 -07:00
Chet Haase
09d569a57e Merge "Fix invalidation roundoff error with old animations" 2011-08-23 15:11:48 -07:00
Chet Haase
530b22ab4e Fix invalidation roundoff error with old animations
We need to add .5 to the width/height of invalidation areas to
avoid truncation errors.

Change-Id: Iaa2407a91a6a7f6d729af21d45e77e436197df11
2011-08-23 14:36:55 -07:00
Justin Ho
5bb73ae8c2 am 09162403: Merge "Updated popup assets Bug: 5080369"
* commit '09162403b578267661c6b15ffbf72607e9bafcdc':
  Updated popup assets Bug: 5080369
2011-08-23 14:24:00 -07:00
Justin Ho
09162403b5 Merge "Updated popup assets Bug: 5080369" 2011-08-23 14:22:14 -07:00
Adam Powell
73ee35e880 am 4af9ce06: Merge "Fix bug 5202226 - Leave menu button visible for no-button phones if targetSdk < ICS"
* commit '4af9ce060d71cb2774731dcc48f844ef9b7145d5':
  Fix bug 5202226 - Leave menu button visible for no-button phones if targetSdk < ICS
2011-08-23 14:16:53 -07:00
Adam Powell
4af9ce060d Merge "Fix bug 5202226 - Leave menu button visible for no-button phones if targetSdk < ICS" 2011-08-23 14:15:05 -07:00
Adam Powell
82349c54ce Fix bug 5202226 - Leave menu button visible for no-button phones if
targetSdk < ICS

Compatibility support for existing apps. Apps in the wild that
properly target <=GB phones and HC tablets should be able to expect
that their small-screen UI will continue to work as intended on ICS
devices. Make sure that we show the soft menu button in the nav bar if
the current device was not officially supported in Honeycomb, the app
does not target ICS or newer, and the window does not have an action
bar.

Change-Id: I069c30841d3827a60ef8040831fde6f4c051d0ee
2011-08-23 14:12:06 -07:00
Justin Ho
3f75d161b8 Updated popup assets
Bug: 5080369

Change-Id: Iff129a4509d6242c7b85bd9dc8201fca3c237021
2011-08-23 14:05:32 -07:00
Jaikumar Ganesh
0963ed73d3 am 234144b5: Merge "Make profile connection state API public."
* commit '234144b56a5c101b0c095ec387c3412d10069991':
  Make profile connection state API public.
2011-08-23 13:48:28 -07:00
Jaikumar Ganesh
234144b56a Merge "Make profile connection state API public." 2011-08-23 13:45:59 -07:00
Amith Yamasani
9ee5c7a3e2 am 7b71e458: Merge "Update searchables when packages are modified, in case they are enabled/disabled."
* commit '7b71e4586babedd52d7f5d4251b9233cdc20d4fb':
  Update searchables when packages are modified, in case they are enabled/disabled.
2011-08-23 13:37:39 -07:00
Jeff Brown
e916e338ef am ade537a3: Merge "Fix race in removeDeadProvider. Bug: 5202824"
* commit 'ade537a33109cf86a9fd9bd658d9f7fdf6a08002':
  Fix race in removeDeadProvider. Bug: 5202824
2011-08-23 13:35:39 -07:00
Amith Yamasani
7b71e4586b Merge "Update searchables when packages are modified, in case they are enabled/disabled." 2011-08-23 13:34:48 -07:00
Jeff Brown
ade537a331 Merge "Fix race in removeDeadProvider. Bug: 5202824" 2011-08-23 13:33:49 -07:00
Jaikumar Ganesh
9354790fa1 Make profile connection state API public.
Change-Id: I1f2810d4e820142435f7bbda051c98ec3e3cf3eb
2011-08-23 12:21:55 -07:00
Amith Yamasani
75a265490a am defa12e9: Merge "Adjust slider range to be one more than max for base 1 volumes."
* commit 'defa12e95b8d25db5f3e9a044e83d6fe680b67a3':
  Adjust slider range to be one more than max for base 1 volumes.
2011-08-23 12:16:42 -07:00
Amith Yamasani
defa12e95b Merge "Adjust slider range to be one more than max for base 1 volumes." 2011-08-23 12:13:07 -07:00
Amith Yamasani
13bc602b21 Update searchables when packages are modified, in case they are enabled/disabled.
Bug: 5198361 : SearchManagerService doesn't respond to package updates.
Change-Id: I2ac794c5da4769eadd6b860ab0f9123060d2a5e5
2011-08-23 12:11:35 -07:00
Jeff Brown
2a4c5acc27 Fix race in removeDeadProvider.
Bug: 5202824

It's possible for removeDeadProvider to be called after the provider
has already been removed from the provider map due to a race between
binderDied and removing the provider.

Deleted removeDeadProviderLocked; it was dead code.

Change-Id: Iecdc68703225e7ac171746e63f1b3141c6f2ce4c
2011-08-23 11:58:26 -07:00
Jean-Michel Trivi
e65796b7d3 am 68e37ae8: Merge "Bug 5045498 New implementation of remote control API"
* commit '68e37ae87ad9932f2119c1b2fc361c1aed5841e4':
  Bug 5045498 New implementation of remote control API
2011-08-23 11:47:46 -07:00
Jean-Michel Trivi
68e37ae87a Merge "Bug 5045498 New implementation of remote control API" 2011-08-23 11:46:44 -07:00
Jean-Michel Trivi
4426e42ac6 Bug 5045498 New implementation of remote control API
Remote control displays expose an IRemoteControlDisplay interface
 which they register through AudioManager.
Remote control clients create a RemoteControlClient object, which
 implicitely exposes an IRemoteControlClient interface registered
 in AudioService through AudioManager.
AudioService tells all clients and displays when a new client
 is the one that should be displayed.
A client's data gets sent to the display when it is valid, or
 it sets new data (while being valid).

The implementation for setting metadata and album art is temporary,
 and will migrate to the MetadataEditor API in future CLs.

Change-Id: Ibab6ea1d94c68f32482c760c6ae269541f885548
2011-08-23 11:23:22 -07:00
Amith Yamasani
d47a3aee7a Adjust slider range to be one more than max for base 1 volumes.
Bug: 5191642
Change-Id: Id479ce584753fbb56feed22a8506579f2d9e35fd
2011-08-23 11:11:35 -07:00
Matthew Xie
2097c062b7 am f9838d0b: Merge "Set bluetooth discoverable off at power on time if the timeout is no forever"
* commit 'f9838d0bb961d5464a92819107747237ea1d923c':
  Set bluetooth discoverable off at power on time if the timeout is no forever
2011-08-23 10:55:46 -07:00
Matthew Xie
f9838d0bb9 Merge "Set bluetooth discoverable off at power on time if the timeout is no forever" 2011-08-23 10:54:07 -07:00
Andreas Huber
8c737e7e65 am d109a7d4: Merge "We were accidentally sending out an output buffer before the final port settings change"
* commit 'd109a7d428cfb6f2f8f504ea9a2b3185a2b46283':
  We were accidentally sending out an output buffer before the final port settings change
2011-08-23 10:35:27 -07:00
Andreas Huber
d109a7d428 Merge "We were accidentally sending out an output buffer before the final port settings change" 2011-08-23 10:32:35 -07:00
Andreas Huber
887b7295da We were accidentally sending out an output buffer before the final port settings change
Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6
related-to-bug: 5122512
2011-08-23 10:22:49 -07:00
Eric Laurent
7db340cd9e am cf56f1e7: Merge "Revert "Change condition to enter silent mode.""
* commit 'cf56f1e7ad7586831faa5bacb537f71cdb227e61':
  Revert "Change condition to enter silent mode."
2011-08-23 08:46:46 -07:00
Eric Laurent
c910571438 am b1d6e76a: Merge "AudioFlinger: add check for audio HAL init failure"
* commit 'b1d6e76af75f705a6165cf69a13365828fc6354a':
  AudioFlinger: add check for audio HAL init failure
2011-08-23 08:44:55 -07:00