62888 Commits

Author SHA1 Message Date
Danielle Millett
63faf6c66f am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2':
  DO NOT MERGE - Cherry picking from master to MR1
2012-01-12 07:31:37 -08:00
Danielle Millett
2931d8ace9 Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1 2012-01-12 07:28:24 -08:00
Brian Colonna
2cd0a0e58e am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '8a1131d78925756835561c3e19cddd2ddf9dbd99':
  DO NOT MERGE cherry-picked FU framework tablet commits
2012-01-12 06:35:27 -08:00
Brian Colonna
8a1131d789 Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1 2012-01-12 06:33:49 -08:00
Mans Rullgard
62a62ef415 stagefright aacenc/amrwbenc: Remove trailing whitespace
This was applied in AOSP master earlier, in commit
b21611e5b0f1797e39e781d91ade023bac87637f, but when merged
into the Google internal tree in
88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these
changes have been brought in. (The diff of this merge commit
and its first parent, d94b71d, is empty.)

Therefore, reapply the rest of these changes on the files
that still are present in the current version.

Change-Id: I645a9b9134769958a11808a06163123d28d83e46
2012-01-12 11:14:04 +02:00
Xia Wang
87badc20c7 am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
2012-01-11 17:53:38 -08:00
Xia Wang
b18a7c3ef1 am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
* commit '1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
  Get average value for image processing test bug#: 5566079
2012-01-11 17:53:36 -08:00
Xia Wang
4ac4ab4ef0 Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1 2012-01-11 17:52:06 -08:00
Xia Wang
1446c7b2ed Merge "Get average value for image processing test bug#: 5566079" into ics-mr1 2012-01-11 17:51:48 -08:00
Scott Main
d4eb682b5f docs: further clarify the behavior of targetSdkVersion
bug: 5854083

Change-Id: I913a245b754604165b4570447f797f7cc66af5f9
2012-01-11 17:23:06 -08:00
Katie McCormick
3808f8ccec 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:29 -08:00
Katie McCormick
6a52c63253 Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 2012-01-11 16:40:37 -08:00
The Android Automerger
1dfa4aaa48 merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:29:04 -08:00
Katie McCormick
2e32a78ead Doc change: Adding Bluetooth HDP info.
Change-Id: Icdc19ed9ea09422ac2ea01c03b4a569d8ae94121
2012-01-11 16:18:50 -08:00
John Wang
70205788fa am 6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
  Adjust the mapping of LTE signal bars.
2012-01-11 15:36:00 -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
Matthew Xie
f3171fb60c Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
Currently, when airplane mode was on and BT was on, turning BT off
moved BT to hotoff state. This fix moves BT all the way to Poweroff
state to have better power performance.
bug 5854282

Change-Id: I7ba41797a46a81ddb3a576453f2a8303b5eed525
2012-01-11 14:46:13 -08:00
Chia-chi Yeh
50fe709995 VPN: silence VPN notifications.
Bug: 5852859
Change-Id: I269d8de298a1fd69a8d777150ae97927537a5424
2012-01-11 14:26:24 -08:00
Selim Gurun
0265a4a0e0 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:32 -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
Daniel Sandler
5962fd5ec9 Clean up wifi/mobile indicators in the expanded panel.
We now have two separate RSSI icons, one for wifi and one
for mobile data, as originally proposed in bug 5544770.
Each has an accompanying label showing the appropriate
network description string (PLMN or SSID or "No internet
connection"); these will be truncated as necessary to avoid
clobbering other UI elements in the panel.

Bug: 5543495
Bug: 5621224
Change-Id: I8fc322f8471fc94000e7230de359d3f1fe561b1e
2012-01-11 16:57:51 -05:00
John Reck
0a3fcc3eed Fix Apache stack
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
2012-01-11 13:35:29 -08:00
Eric Laurent
05985a2e2a 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:45 -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
4ada9c6f3e 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:41 -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
25b772f357 am acd152f0: docs: editorial fix to homepage
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
  docs: editorial fix to homepage
2012-01-10 21:13:38 -08:00
Scott Main
acd152f0b7 docs: editorial fix to homepage
Change-Id: Iaebcacb6be770435091de181e8ee3f9c81d58139
2012-01-10 21:10:08 -08:00
Jim Miller
28a0767751 Fix 5620754: don't show pattern screen after SIM PUK unlock
This fixes a bug introduced in testing 34a62348. The code now
properly invokes the callbacks before returning.

Change-Id: I637a8a792838379f0c8b42ef634da82787fcd961
2012-01-10 18:35:21 -08:00
Scott Main
7cffe2c668 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:28 -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
3d0891d187 am 548972d7: Merge "Android Design" into ics-mr1
* commit '548972d798f06c91cb8cba6716952322da97ac21':
  Android Design
2012-01-10 17:04:05 -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
5a3e67c781 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:36 -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
d3872f5504 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:30:41 -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
Danielle Millett
de7a2f3054 DO NOT MERGE - Cherry picking from master to MR1
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
2012-01-10 11:40:41 -05:00
Pin Ting
06e617f5a6 am 497661d3: Merge "Fixes typo." into ics-mr1
* commit '497661d309ea960aa9723ef4e0d064b56515b566':
  Fixes typo.
2012-01-09 19:00:16 -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
d476c8b8a8 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:02 -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
ab6ccca0d3 am 64140a07: Fix Music import for Turkish locales.
* commit '64140a0770f98b56993a96289ec3143e89194265':
  Fix Music import for Turkish locales.
2012-01-09 16:12:32 -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
Brian Colonna
7664c0e99d DO NOT MERGE cherry-picked FU framework tablet commits
- cherry-picking framework CLs from master into ics-mr1 that are
  needed for FU to work on tablets

- needed for OEM partners even FU isn't going on xoom

Squashed commit of the following:

commit 3258f2528f558efdaf34ae15c5425f2d879848fe
Author: Brian Colonna <bcolonna@google.com>
Date:   Tue Dec 13 15:49:48 2011 -0500

    Added Face Unlock to tablet lockscreen layouts

    The Face Unlock Area was not part of the tablet layouts, so prior to
    this change, Face Unlock would not show up on tablets when selected as
    the unlock method.  The backup unlock method would show up instead.

    The goal here is for the pattern and PIN unlock layouts (in both
    portrait and landscape mode) to look the same as before this change.
    This was a little harder than it was with the phone layouts for two
    reasons:

    1) For the phones it was ok for Face Unlock to be sized such that it
    just covers the backup method.  For the tablets we want Face Unlock
    to cover far more real estate.

    2) The phones were based on a grid layout, whereas the tablet is a
    linear layout.

    Note that the diff makes the modifications look way more extensive
    than they actually are.  Basically, in most cases I am putting a
    relative layout around some existing portion of the layout and
    putting the Face Unlock Area area inside of the new relative layout.

    Change-Id: I478becddf2a9ee9fe7b6d653e604fa3ad89b822f

commit 821cfe85cf2b3daf074d9749dbf6e0a5663af0de
Author: Brian Colonna <bcolonna@google.com>
Date:   Mon Dec 19 15:51:10 2011 -0500

    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

commit fa90bb76ac6b311d12b55d23df4ac44cec62c7b3
Author: Brian Colonna <bcolonna@google.com>
Date:   Mon Dec 12 18:02:23 2011 -0500

    Changed how Face Unlock coordinates are specified

    Was using View.getLeft() and View.getTop() to specify the upper-left
    corner of the Face Unlock area.  That gives coordinates relative the
    view, which was fine for the phones.  For the tablet it needs
    coordinates relative to the window (which still works for the phones).

    Also fixed a 'bug' where h and w were swapped.  However, it wasn't
    causing a problem because it was swapped in two places.

    Change-Id: I86c1f68439f1dcef826cfe6b8fb56c9a4a6b8dc3

Change-Id: I962c0486be85949e002b0a2701286a6a39251f36
2012-01-09 16:22:12 -05:00