75507 Commits

Author SHA1 Message Date
Makoto Onuki
46891a8f1c Update streamitems javadoc
ACCOUNT_TYPE and ACCOUNT_NAME query parameters were required in API level 15.
We've removed the check for JB, but in order to keep compatibility with HC
apps still need to add those parameters.

Bug 5135278

Change-Id: Ib9b9751c9017c53905047045816a44c5a279fa64
2012-04-26 15:41:48 -07:00
Ying Wang
002f53770a Apply --extra-packages in case --custom-pacakge is also specified.
Cherry-picked from master.

Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88
2012-04-26 13:13:08 -07:00
Gilles Debunne
64ac862f7b Merge "Basic renaming refactoring in Layout" into jb-dev 2012-04-26 12:51:59 -07:00
John Reck
a75fbc3c76 Merge "On new content, attach functor directly" into jb-dev 2012-04-26 12:27:56 -07:00
Teng-Hui Zhu
85973212e9 Merge "DO NOT MERGE:The visiblerect calculation should take view's scaling into consideration" into jb-dev 2012-04-26 11:28:17 -07:00
Adam Powell
9004053c59 Merge "Fix janky programmatic ListView scrolling" into jb-dev 2012-04-26 11:14:02 -07:00
Adam Powell
0b8acd81d5 Fix janky programmatic ListView scrolling
Adjust AbsListView to use a linear interpolator for smooth scrolling
rather than the default scroller behavior. This prevents irregular
motion as the scroll is altered in-flight to account for varying
height list items.

Bug 6397800

Change-Id: I8cc33dfc18903943369e1353930c48e2652b0142
2012-04-26 11:10:27 -07:00
Steve Block
ff35000ce1 Merge "Fix JavaDoc style for several WebView classes" into jb-dev 2012-04-26 11:02:32 -07:00
Dave Burke
2996cf03a2 Merge "Unhide new AAC-ELD audio record type." into jb-dev 2012-04-26 10:58:57 -07:00
Andreas Huber
129a6ccbb8 Merge "The MediaExtractor can now unselect tracks and has more control over seeking." into jb-dev 2012-04-26 10:56:58 -07:00
Michael Kolb
77974166db Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev 2012-04-26 10:54:58 -07:00
Andreas Huber
f2855b3df5 The MediaExtractor can now unselect tracks and has more control over seeking.
Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417
related-to-bug: 6276111
2012-04-26 10:43:31 -07:00
Michael Kolb
13d7c03eb8 Fix NPE in isPrivateBrowsingEnabled()
Bug: 6393286

Change-Id: I1fd9c57b7bd68a9c495cbb0df45a406f83b22b5f
2012-04-26 10:43:08 -07:00
Eric Laurent
8037cad6c1 Merge "Fix AudioManager.forceVolumeControlStream()" into jb-dev 2012-04-26 10:22:13 -07:00
Makoto Onuki
f307268cd5 Merge "Clearify javadoc on Phone.NORMALIZED_NUMBER." into jb-dev 2012-04-26 10:15:42 -07:00
satok
9b593a67f1 Merge "Fix the boundary of the sentence level spell check" into jb-dev 2012-04-26 08:12:31 -07:00
Steve Block
4e584df4ce Fix JavaDoc style for several WebView classes
This fixes the JavaDoc style for the following classes ...
- CacheManager.java
- CookieManager.java
- GeolocationPermissions.java
- WebResourceResponse.java
- WebSettings.java
- WebStorage.java
- WebView.java

In particular, this applies the guidelines at
https://wiki.corp.google.com/twiki/bin/view/Main/APIDocumentation

This should help to ensure that future JavaDoc comments use correct style,
rather than using incorrect style for consistency.

Note that this change does not attempt to improve the content of the JavaDoc
comments. This will be done in later changes.

Bug: 5461416
Change-Id: I79e9b15a8cf3597195d58e154a7eb1bcc462944c
2012-04-26 13:59:52 +01:00
Steve Block
e9e260fbc0 Add tests for uncaught exceptions from methods called through the Java Bridge
This is a cherry-pick from master. See
https://android-git.corp.google.com/g/184260

If a method called on a Java object through the Java Bridge throws an uncaught
exception, we throw a JavaScript exception.

See WebKit change https://android-git.corp.google.com/g/184252

Bug: 6386557
Change-Id: Ie2a97a26372fb11782b35db09bc2046fb7eb1f86
2012-04-26 13:59:51 +01:00
Steve Block
8a1da40523 Update DroidNashk to version 1.10
This is the latest drop (ver 1.10) of DroidNaskhShiftAlt.ttf from Monotype.

Bug: 5987379
Change-Id: I68a4dc89e3bb98e9d326eb9de196c1017503635b
2012-04-26 13:59:51 +01:00
satok
24d146b966 Fix the boundary of the sentence level spell check
Bug: 6400290
Change-Id: Ifb3b2f4034a1717369c63206611e5b6c441fded5
2012-04-26 21:41:49 +09:00
Dave Burke
6644a826a1 Unhide new AAC-ELD audio record type.
Change-Id: Ibb9d3cd797c0b14c495776dc172ff7dadf6df7d6
2012-04-25 23:15:22 -07:00
Romain Guy
fc8e5eaa03 Merge "Ensure we start every frame in the proper GL state Bug #6345013, #6314960" into jb-dev 2012-04-25 20:05:09 -07:00
Romain Guy
c189ef5322 Ensure we start every frame in the proper GL state
Bug #6345013, #6314960

Change-Id: I6985f7f233eb6a5f9223e9f4be3f323154b5dbf0
2012-04-25 20:02:53 -07:00
Amith Yamasani
344c993e56 Merge "Don't unregister receiver twice." into jb-dev 2012-04-25 18:58:06 -07:00
Gilles Debunne
eca5b7385a Basic renaming refactoring in Layout
Change-Id: I79f5444a097f1e2b2a81ececf1f0a14b6d7d5179
2012-04-25 18:48:42 -07:00
Jeff Brown
57c2e3df7d Merge "Map KEY_SELECT to DPAD_CENTER." into jb-dev 2012-04-25 18:38:55 -07:00
Jeff Brown
80b2760332 Map KEY_SELECT to DPAD_CENTER.
Change-Id: If387be6b233db2222347e39e9edb3ad886e936a3
2012-04-25 18:35:46 -07:00
Eric Laurent
45c90cefd1 Fix AudioManager.forceVolumeControlStream()
AudioManager.forceVolumeControlStream() is used by VolumePanel to temporarily force the
stream type which volume is controlled by volume keys.

Current implementation is not working if the VolumePanel is not executed by the same process
as the one receiving the volume key events.

Issue 6302421.

Change-Id: I2700587a027ffb962429b42083312cd92fe79215
2012-04-25 18:28:09 -07:00
Jeff Brown
3bba862960 Merge "Add yet more keyboard layouts." into jb-dev 2012-04-25 18:21:01 -07:00
Amith Yamasani
2efb6a94ca Don't unregister receiver twice.
Bug: 6008202
Change-Id: I3a9c76b74c1451b634341806d9c93768925737cd
2012-04-25 18:18:30 -07:00
Jeff Brown
69b2be163d Add yet more keyboard layouts.
Bug: 6110399
Change-Id: I8e2ce1cd350dddb006df51286e127dce65a8117f
2012-04-25 18:17:21 -07:00
Dianne Hackborn
2c227f4d2f Merge "DO NOT MERGE. Do not dispatch context selection events to non-visible fragments." into jb-dev 2012-04-25 17:28:21 -07:00
Marco Nelissen
83cab25821 Merge "Further speed up playlist processing" into jb-dev 2012-04-25 16:59:38 -07:00
Marco Nelissen
0b718392c1 Further speed up playlist processing
Previously when processing playlists, the entire audio table would be read for
every line in a playlist file. While there would be only one query, a lot of
data was being moved from sqlite to java over and over again, and if the data
didn't all fit in a CursorWindow, additional queries would be done under the
hood.
With this change, playlists are first cached in memory. Then the audio table
is queried, and for every row in the audio table, the best match from the
playlist cache is found. This way the audio table is only traversed once,
so each row is only fetched once. Once the entire audio table has been read,
the in-memory playlist cache contains the best matching entry for each line,
and the playlists are written out to the database. Currently, the audio table
is traversed once for each playlist. This could be further optimized in the
future by processing all playlists at the same time.

b/6346786

Change-Id: Iead3f9ae838d600d085e8e6d3c4874d42314468e
2012-04-25 16:30:42 -07:00
Chris Craik
c2c9543c13 On new content, attach functor directly
bug:6323847

depends on external/webkit change: https://android-git.corp.google.com/g/#/c/184314/

Change-Id: Ibdf997f3ee4f5c5c1ea5a320556813f175fea93f
2012-04-25 15:42:59 -07:00
Jake Wharton
c0581aff1d DO NOT MERGE. Do not dispatch context selection events to non-visible fragments.
When used in a `ViewPager`, fragments that are present on the adjacent,
cached pages will receive context selection dispatches which, depending
on your fragment contents, can be difficult to determine whether or not
the event truly originated from your view.

By using the visible hint we restrict dispatching to only those fragments
which are marked as being visible. Since the fragment pager adapter
updates this setting properly most implementations will be afforded this
fix without any change required. If the user is implementing their own
adapter they likely already understand the implications of these cached
fragments and the reponsibility for updating the boolean falls to them.

Mirrors support library change Ie6a72c1c82c2784774373670007b6f5948fe16da

Integrated from AOSP.

Change-Id: I19bbbe4c8d910fb38c14d6ae5d462eb7dd44fd26
2012-04-25 15:41:16 -07:00
Kenny Root
1fa1de527e Merge "Allow forward locked apps to be in ASECs" into jb-dev 2012-04-25 15:40:52 -07:00
Jeff Sharkey
d7a2a428db Merge "Move RINGTONE_PICKER to handle external storage." into jb-dev 2012-04-25 15:25:46 -07:00
Michael Jurka
34688bbf83 Merge "Make Advanceable a public API." into jb-dev 2012-04-25 15:14:51 -07:00
Robert Greenwalt
2c1de863c3 Merge "Add bit to eventlog to handle new network types" into jb-dev 2012-04-25 15:12:03 -07:00
Jeff Sharkey
6dcf382b1b Move RINGTONE_PICKER to handle external storage.
To give RINGTONE_PICKER external storage access, move it from system
to MediaProvider.  Fix OOBE when getRingtoneUri() kicked requery().

Bug: 6346701
Change-Id: I837002eef0580b8cdd8920a27b068c745995a8a3
2012-04-25 14:56:13 -07:00
Robert Greenwalt
3bc9a79fe8 Add bit to eventlog to handle new network types
bug:5514930
Change-Id: I29288cb39902578992ee53b171f228f8eeb407fd
2012-04-25 14:31:08 -07:00
Kenny Root
6dceb88f1c Allow forward locked apps to be in ASECs
We couldn't put forward-locked apps in ASEC containers before since we
didn't have any permissioned filesystems. This adds the ability for
forward-locked applications to be in ASEC containers.

This means that forward locked applications will be able to be on the SD
card now.

This change also removes the old type of forward-locking that placed
parts of apps in /data/app-private.  Now all forward-locked applications
will be in ASEC containers.

Change-Id: I17ae0b0d65a4a965ef33c0ac2c47e990e55707ad
2012-04-25 14:17:02 -07:00
Michael Jurka
ba0ee8fce6 Make Advanceable a public API. 2012-04-25 14:02:21 -07:00
Makoto Onuki
e5420e9c98 Clearify javadoc on Phone.NORMALIZED_NUMBER.
This column can be null even if NUMBER isn't.

Change-Id: I74698c7caca87b92aee469b8d343c4d20a78f4fd
2012-04-25 13:24:41 -07:00
Teng-Hui Zhu
9d28157866 DO NOT MERGE:The visiblerect calculation should take view's scaling into consideration
bug:5684832
Change-Id: I9d29b1f32b19ad73aeae6a5c0873ec04722ff1ac

cherry-pick from master:
https://android-git.corp.google.com/g/#/c/183798/
2012-04-25 13:02:21 -07:00
Jean-Michel Trivi
1b8f499a14 Allow multichannel configurations in android.media.AudioTrack
Compare the channel configuration against a mask of the public
 channel masks in AudioFormat for up to 5.1 with back channels,
 and allow combinations within this mask.

Change-Id: I84b72dfd88d4490f0c67bf10d13151a9eb06f6a8
2012-04-25 11:12:37 -07:00
Robert Greenwalt
7725180c64 Prefer the preferred APN for all types it supports
We used to only prefer it when connecting for default connection purposes,
but it makes sense to use the preference for all apn types it supports.

bug:6377793
Change-Id: I8b26b77fc0787121749cce9d32303ab24cc72c75
2012-04-25 09:44:53 -07:00
Daisuke Miyakawa
867b96bd15 Merge "Add debug log for 5914560 and 6383850" into jb-dev 2012-04-25 08:57:55 -07:00
Chris Wren
321452da28 Set row height to the row height not the notification height.
Bug: 6376501
Change-Id: I41567b11fcb1d39bc75ef782faa8287bbb1e4ca8
2012-04-25 11:20:35 -04:00