65280 Commits

Author SHA1 Message Date
Katie McCormick
4f7014d738 am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '6a52c632530fa39de570c9a6630264178c20e58e':
  Doc change: Adding Bluetooth HDP info.
2012-01-11 16:42:44 -08:00
Katie McCormick
6a52c63253 Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 2012-01-11 16:40:37 -08:00
Katie McCormick
2e32a78ead Doc change: Adding Bluetooth HDP info.
Change-Id: Icdc19ed9ea09422ac2ea01c03b4a569d8ae94121
2012-01-11 16:18:50 -08:00
John Wang
8f4de37a38 am 6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
  Adjust the mapping of LTE signal bars.
2012-01-11 15:36:07 -08:00
John Wang
6ad68ba9d9 Adjust the mapping of LTE signal bars.
bug:5640958
Change-Id: I91efc5a81b505aae59dac9b1d69314efaffda6b6
2012-01-11 14:47:19 -08:00
Selim Gurun
6b284507aa am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
  Do Not Merge. Move ssl callbacks to webcore thread.
2012-01-11 14:20:45 -08:00
Selim Gurun
51938e2691 Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 2012-01-11 14:18:14 -08:00
Jason Simmons
6e5d9dfc5f Merge "Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes" into ics-aah 2012-01-11 12:51:52 -08:00
Mike Lockwood
a7cc8f6f49 Merge "Allow disabling network stats support in a resource overlay" into ics-aah 2012-01-11 11:24:11 -08:00
Eric Laurent
87ebdf6e01 am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
  stagefright: limit audio gap for looped playback
2012-01-11 11:12:55 -08:00
Eric Laurent
c15cf3d286 Merge "stagefright: limit audio gap for looped playback" into ics-mr1 2012-01-11 11:10:38 -08:00
Selim Gurun
972b1a505c Do Not Merge. Move ssl callbacks to webcore thread.
Bug: 4586251

Cherry picking from master for ics-mr1.

Current ssl cert logic makes callbacks to webkit from the
UI thread. This is not right. Move the callbacks to proper thread.

Change-Id: I59affba47eca01b74e2bc33d88ef83a5850d6ce9
2012-01-11 10:18:54 -08:00
Roman Nurik
41102347c5 am c894fb7e: Prevent Android Design sidenav links from opening a new window
* commit 'c894fb7e15f46381fc783da1236b8bbb4a0e33d6':
  Prevent Android Design sidenav links from opening a new window
2012-01-11 00:21:12 -08:00
Roman Nurik
c894fb7e15 Prevent Android Design sidenav links from opening a new window
Change-Id: I0ec74fb7ae9e348717d0d96603cd03c58c03459d
2012-01-10 23:59:20 -08:00
Scott Main
c8e80e2405 am acd152f0: docs: editorial fix to homepage
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
  docs: editorial fix to homepage
2012-01-10 21:13:05 -08:00
Scott Main
acd152f0b7 docs: editorial fix to homepage
Change-Id: Iaebcacb6be770435091de181e8ee3f9c81d58139
2012-01-10 21:10:08 -08:00
Scott Main
eb84dbe918 am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1
* commit '05fc9f655aaa01cdb38229d1dc6155a341fa316b':
  docs: add links to Android Design from dev docs
2012-01-10 17:10:20 -08:00
Scott Main
05fc9f655a Merge "docs: add links to Android Design from dev docs" into ics-mr1 2012-01-10 17:08:19 -08:00
Roman Nurik
9fd4dd0563 am 548972d7: Merge "Android Design" into ics-mr1
* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design
2012-01-10 17:04:06 -08:00
Roman Nurik
548972d798 Merge "Android Design" into ics-mr1 2012-01-10 17:01:45 -08:00
Roman Nurik
7379046690 Android Design
Change-Id: I2692ca03fc4c0d088aec0588a36739203f4cf2d2
2012-01-10 16:42:13 -08:00
Scott Main
eb5dacddc4 docs: add links to Android Design from dev docs
Change-Id: Ib2334be0a05d33008d2e4850547ff1c3b7b16764
2012-01-10 14:19:19 -08:00
Scott Main
256c954587 am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1
* commit 'd1186cd5bb445e9b0768edf6cb87022865cada55':
  docs: fix broken links in .jd docs
2012-01-10 12:55:21 -08:00
Scott Main
d1186cd5bb Merge "docs: fix broken links in .jd docs" into ics-mr1 2012-01-10 12:53:42 -08:00
Jim Miller
f33359453e am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit '62fad7689567bed6ec372401c1b171659c28572d':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:31:56 -08:00
Jim Miller
62fad76895 Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 2012-01-10 10:28:21 -08:00
Pin Ting
ec3f67171c am 497661d3: Merge "Fixes typo." into ics-mr1
* commit '497661d309ea960aa9723ef4e0d064b56515b566':
  Fixes typo.
2012-01-09 19:00:39 -08:00
Pin Ting
497661d309 Merge "Fixes typo." into ics-mr1 2012-01-09 18:58:13 -08:00
Jim Miller
a4edd151c5 Fix 4560303: Add setting to lock later when power button pressed
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

For the case of a secure device (user has a pin/password/pattern),
this will lock the device immediately or not based on the setting.

For the non-secure case, this always "locks" the device to provide easy
access to the camera while preventing unwanted input.

Change-Id: Ie328485c3f7559e26896d761cbf0e69d3f4df4e2
2012-01-09 17:30:58 -08:00
Dianne Hackborn
7d537b5568 am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
* commit 'd3be0a76e46584357dbb77fcd200128d0d7dc9a8':
  Unhide Resources APIs for getting resources at specific densities.
2012-01-09 16:49:12 -08:00
Dianne Hackborn
d3be0a76e4 Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 2012-01-09 16:47:35 -08:00
Elliott Hughes
b70c49f294 am 64140a07: Fix Music import for Turkish locales.
* commit '64140a0770f98b56993a96289ec3143e89194265':
  Fix Music import for Turkish locales.
2012-01-09 16:11:55 -08:00
Eric Laurent
577d6ccb7b stagefright: limit audio gap for looped playback
The audio gap when looping audio is mostly due to
a delay requested by the audio player when executing
the end of stream message. This is to allow the audio
to be drained out of the pipe before actually stopping the
AudioTrack.
This delay is not needed when looping as the AudioTrack
is not stopped.

The fix consists in ignoring the requested delay when the
looping flag is set in awesome player.

Issue 5800981.

Change-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5
2012-01-09 13:48:25 -08:00
Elliott Hughes
64140a0770 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: If5b7154f70a7db22837d071d1c57e929729b7d35
2012-01-09 13:36:36 -08:00
John Grossman
625d40a920 libaah_rtp: address http://b/issue?id=5755419
Introduce a heartbeat timeout for TX senders.  If none of the TX
sender's clients send any packets for this timeout period (10 minutes
right now), then the sender will stop sending keep-alive heartbeats.
This should cause RX clients to release any held media resources,
including any timed audio track.  Releasing timeed audio tracks allows
the audio system to go into its idle state, which allows the power amp
in Tungsten to power all of the way down, saving both heat and power.

Change-Id: Ib7a96d334e1064ddea3f07a6b21e6efedefc549a
Signed-off-by: John Grossman <johngro@google.com>
2012-01-09 12:23:37 -08:00
Dianne Hackborn
613989772f Unhide Resources APIs for getting resources at specific densities.
This adds Resources.getDrawableForDensity() and
Resources.getValueForDensity().  These are needed for applications
to correctly retrieve larger icons such as in launcher when
running on a tablet.  We had already exposed the APIs to tell the
application which density to use for app icons on the current
device, but didn't unhide these APIs that allowed you to
actually retrieve them.

This is safe to do without introducing a new API level (as long
as we do it soon) because we know these APIs already exist in
Android 4.0, and there is no reason for anyone to be removing
them when building a device.

Change-Id: I5138e5dc908197b66a98d20af73c5374cb5d41d3
2012-01-09 12:00:30 -08:00
Mike Lockwood
edac0e7f96 Merge "Restore persisted master volume if the media server restarts" into ics-aah 2012-01-09 08:45:34 -08:00
Pin Ting
e4c1e7db16 Fixes typo.
Change-Id: I79e09594017d1e2decb927bff0d7c8a0fc2873f2
2012-01-09 11:27:56 +08:00
Eino-Ville Talvala
035e9a3bd5 am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '7944704e6c4cc10105838b78d3d8403bf66a066b':
  Switch camera sounds to always use the system enforced audio stream.
2012-01-06 15:49:21 -08:00
Bart Sears
3355f7a453 am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit 'a476eed6b291d06f5e571597b928b7b2f0b3f257':
  getDuration can be only called after prepared. DO NOT MERGE
2012-01-06 15:46:58 -08:00
Eino-Ville Talvala
7944704e6c Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 2012-01-06 15:46:36 -08:00
Bart Sears
a476eed6b2 Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 2012-01-06 15:45:13 -08:00
Wink Saville
956ca43926 am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
* commit '2f143a966ccfec71de2c3a9785f5f3f47d418acb':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
2012-01-06 14:29:39 -08:00
Wink Saville
2f143a966c Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 2012-01-06 14:27:56 -08:00
Fabrice Di Meglio
de78c65f14 am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
* commit 'c1d03cff271d81fc9948648583e9e07c0c624dc1':
  Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
2012-01-06 14:21:12 -08:00
Fabrice Di Meglio
c1d03cff27 Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1 2012-01-06 14:19:20 -08:00
Justin Ho
a4df3a8d44 am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
* commit 'beb8be60d157e4812e0195c2e445aa0abb82d9a2':
  Fixing crash when taking screenshot over secure window.
2012-01-06 14:09:43 -08:00
Justin Ho
f0df56b75d am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '3116b7a7ca6681daabbdac55e71203995e7a7afe':
  Updating default image wallpaper for tablet.
2012-01-06 14:09:41 -08:00
Justin Ho
beb8be60d1 Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 2012-01-06 14:07:51 -08:00
Justin Ho
3116b7a7ca Merge "Updating default image wallpaper for tablet." into ics-mr1 2012-01-06 14:07:37 -08:00