64348 Commits

Author SHA1 Message Date
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
satok
c36905673a Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard
Bug: 5806103

Change-Id: I1a83b227498073c47567f73566043c273809adc9
2012-01-11 17:03:03 +09: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
837bc7f936 am 25b772f3: am acd152f0: docs: editorial fix to homepage
* commit '25b772f357d79ddf39c69541839465a9fd2cbf39':
  docs: editorial fix to homepage
2012-01-10 21:16:08 -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
Sungsoo Lim
6c4c155696 MediaScanner: Disable bulk insert for settings
Since the settings (notifications, ringtones, and alarms) request
rowId after inserting into DB, do not use bulk insert for them.
(Bulk insert does not return the rowId)

Change-Id: I8faf993f8ac2da96672594a1c92ddc917f964d6f
2012-01-11 11:34:20 +09:00
Jeff Sharkey
2cc28deb9e Merge "Move non-monotonic reporting to interface." 2012-01-10 17:41:01 -08:00
Jeff Sharkey
5a7bcf31a4 Move non-monotonic reporting to interface.
Report non-monotonic NetworkStats through an observer interface
instead of throwing, since those events are still recoverable.

Change-Id: Ic0749f4634b0ac05dbe90e95ca490957ec8b2f23
2012-01-10 17:24:44 -08:00
Teng-Hui Zhu
e4c89e321c Query the native side to decide to play when going into full screen mode
Previously we save the state in Java side, but it is better to check with
native side since the exact state is already there.
This will help to get the updated state from javascript too.

bug:5765848

Webkit side change:
https://android-git.corp.google.com/g/#/c/157866/

Change-Id: Id0316b694c1597b50a1c3b123b31efc6b0fac706
2012-01-10 17:17:02 -08:00
Scott Main
c347a9a61e am 7cffe2c6: am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1
* commit '7cffe2c66815fcd2c5dc4579ed964901bc17b431':
  docs: add links to Android Design from dev docs
2012-01-10 17:12:25 -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
1fd8f382f5 am 3d0891d1: am 548972d7: Merge "Android Design" into ics-mr1
* commit '3d0891d18782451e2b1461b0bd13ff6f28736d69':
  Android Design
2012-01-10 17:06:59 -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
Ying Wang
044a0b8ae5 Merge "Build all test apks as raw resource in FrameworksCoreTests." 2012-01-10 16:37:43 -08:00
Glenn Kasten
81801adc14 Fix race in AudioSystem::getInputBufferSize
It was caching the recording parameters without a mutex.

Change-Id: Ic4b9f621cbc080d224c2233cf3ca3454fc0f19bd
2012-01-10 15:43:48 -08:00
Glenn Kasten
77b6aaf62d Fix bug in JetPlayer::loadFromFile
A long pathname would corrupt the heap due to incorrect use of strncpy.

Also was using hard-coded constant 256 instead of PATH_MAX.

Change-Id: Iba382bbb38624fbc41fec91449f9814f77d4ac0d
2012-01-10 15:43:24 -08:00
Glenn Kasten
01aaf2c401 Simplify range check for audio_mode_t
AudioSystem::setMode previously allowed negative modes, but these were
then rejected by AudioFlinger.

Now negative modes (including AUDIO_MODE_INVALID and AUDIO_MODE_CURRENT)
are explicitly disallowed.

Change-Id: I0bac8fea737c8eb1f5b6afbb893e48739f88d745
2012-01-10 15:42:32 -08:00
Ying Wang
24162fc52c Build all test apks as raw resource in FrameworksCoreTests.
Bug: 5848975
Change-Id: I395013ded1c29e0914f72e03d0abd60bb4a7973a
2012-01-10 15:12:10 -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
Steve Block
38e90751a2 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:32 -08:00
Scott Main
f6f793c4ac am 5a3e67c7: am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1
* commit '5a3e67c7811d4a7906548e113561cd1e901de9e2':
  docs: fix broken links in .jd docs
2012-01-10 12:58:03 -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
5437c220e2 am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:34:51 -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
251f048544 am 06e617f5: am 497661d3: Merge "Fixes typo." into ics-mr1
* commit '06e617f5a6f68ca99118268eb7361bb1e5ade0a5':
  Fixes typo.
2012-01-09 19:03:07 -08: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
Romain Guy
10b0684296 Prevent the GC from destroying the underlying native object
Change-Id: I9aaba5d82828af83dad8e6a270d2ab8c92b42be5
2012-01-09 18:42:49 -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
32313b161f am d476c8b8: am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
* commit 'd476c8b8a8a6fadea7e72426d3e93c4e6b00e543':
  Unhide Resources APIs for getting resources at specific densities.
2012-01-09 16:51:52 -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
14f722359c am ab6ccca0: am 64140a07: Fix Music import for Turkish locales.
* commit 'ab6ccca0d3498e0732c82c867fd2867c5d006783':
  Fix Music import for Turkish locales.
2012-01-09 16:37:38 -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
Mangesh Ghiware
2ddb4c8509 Merge "Fix issue with site-specific display density getting stuck." 2012-01-09 16:02:21 -08:00
Adam Powell
f6a2ae3719 Merge "Fix a bug where window progress bars had the wrong default visibility on windows with action bars." 2012-01-09 15:55:55 -08:00
Adam Powell
45b075dd5c Fix a bug where window progress bars had the wrong default visibility
on windows with action bars.

Change-Id: I5509d9a7c5f029b0471bd63e781f4756f5a319bc
2012-01-09 15:41:40 -08:00
Mangesh Ghiware
6f2db8e755 Fix issue with site-specific display density getting stuck.
This issue was found while investigating b/5328288.

After navigating to a page that specifies target-densitydpi in the
viewport meta tag, this density value wasn't reset to the default value
for a page that didn't.

Change-Id: I1a66dab769026367224ecf4cc28bc033ee97e475
2012-01-09 13:53:01 -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
Steve Block
ec193dec4d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
2012-01-09 21:36:22 +00: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