76379 Commits

Author SHA1 Message Date
Irfan Sheriff
ba1db8a591 Merge "Fix wifi direct issues" into jb-dev 2012-05-11 14:46:46 -07:00
Stephen Hines
dcc1996b76 Merge "Test clamp (full and relaxed precision)." into jb-dev 2012-05-11 14:25:56 -07:00
John Reck
dee9d9ab9f Merge "Prevent updateStateTrackers from being affected by preventDefault()" into jb-dev 2012-05-11 14:23:18 -07:00
Jeff Brown
b12b6b5116 Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev 2012-05-11 14:03:38 -07:00
John Reck
387c2e8d42 Prevent updateStateTrackers from being affected by preventDefault()
Bug: 6477996
 Calling e.preventDefault() on a javascript touch handler is apparantly
 not supposed to prevent the default gesture detector, who knew?

Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
2012-05-11 13:50:57 -07:00
Teng-Hui Zhu
ef27936371 Merge "Fix a crash." into jb-dev 2012-05-11 13:45:13 -07:00
Irfan Sheriff
10ca870d3b Fix wifi direct issues
- BSS command is unreliable, use group owner information from p2p_find
- Fix the autonomousgroup settings
- Use group idle settings only on the p2p group interface to avoid group idle
resulting group formation failures

Bug: 6426991
Change-Id: I44fc204775580fb4fec6ce27070ddbde0751b495
2012-05-11 13:39:29 -07:00
Teng-Hui Zhu
422400f92d Fix a crash.
End can happen when error happens, but media controller may be not ready yet.

bug:5340224
Change-Id: I94607dfdf26d2dc4c7bbc9c2a62f98deccb8d198
2012-05-11 13:00:03 -07:00
Chet Haase
76f082189e Merge "Fix quickReject logic for transformed views" into jb-dev 2012-05-11 12:59:41 -07:00
Jeff Brown
8a90e6e317 Minor refactoring before starting on velocity tracker changes.
Bug: 6413587
Change-Id: I5eba2bb57193bff78cb3740de5f87aca0b31d154
2012-05-11 12:32:56 -07:00
Jeff Brown
2f09576074 Rename kcm attribute to keyboardLayout.
Bug: 6478076
Change-Id: I7fc0d8eb36d03a628d070f8fd6ea1e1464b1a163
2012-05-11 12:32:56 -07:00
Raph Levien
3816174b3b Add explicit id for fontFamily attribute.
The merge for the attribute crossed in flight with making jb-dev a
release branch.

Change-Id: Ic9a2a34a8e3c54efa17a98365f58f24fe365b532
2012-05-11 11:48:57 -07:00
Chet Haase
1a3ab175b0 Fix quickReject logic for transformed views
When a parent draws its child views, each child's bounds is checked
against the current dirty region. If the view falls outside of that
region is is rejected and doesn't enter into the parent's DisplayList.

This works in general, for both transformed and untransformed views
(because we skip this check if the view is transformed). But it breaks down
when the transform properties of the view change later, since DisplayList
properties simply push these values down to the view's DisplayList without
invalidating the parent. If a view is rejected when untransformed, then there
is nothing to cause it to be considered again until something causes an
invalidate of the parent.

The fix is to note when a view is rejected and record that information.
Later, when one of the transform-related properties change, we invalidate the parent
to force the check to happen again, which will cause the view to get drawn
if it's visible.

Issue #6477730 quickRejected views must recreate their DisplayLists on transform changes

Change-Id: I70caf198005cd7e424a37bccc6ae050e09880a6c
2012-05-11 11:03:12 -07:00
Chet Haase
26511012c4 Merge "Clear animations in DisplayLists when done" into jb-dev 2012-05-11 10:57:40 -07:00
Romain Guy
d303dd3da2 Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev 2012-05-11 10:25:06 -07:00
Romain Guy
78245f77d2 Prevent NPE in TextureView.getBitmap()
This crash could occur when invoking setSurfaceTexture() then getBitmap()
before the View has a chance to be drawn.

Change-Id: I25c55df15750e59b9c916e8f750de2c89718d39e
2012-05-11 10:01:42 -07:00
Teng-Hui Zhu
9ac320406b Merge "Keep the controller when video ended." into jb-dev 2012-05-11 10:00:06 -07:00
Teng-Hui Zhu
6df5ca08f1 Merge "Avoid inline->fullscreen reload for html5 video." into jb-dev 2012-05-11 09:59:57 -07:00
Raph Levien
c9c275fe5c Merge "Add RobotoCondensed family and optimized Roboto Light." into jb-dev 2012-05-11 09:37:14 -07:00
Raph Levien
75ef98f821 Merge "Add fontFamily XML attribute to select font family by string" into jb-dev 2012-05-11 09:31:22 -07:00
Chris Wren
156c79289d Merge "Don't allow notificaitons to be larger than 4U, even with actions. Limit BigText template to a fixed number of lines. Optimize layout of BigText and Inbox for expansion." into jb-dev 2012-05-11 09:28:08 -07:00
Andrew Flynn
b23341e4c5 Merge "Move airplane icon to its own view" into jb-dev 2012-05-11 09:08:15 -07:00
Chris Wren
ca7b7d0566 Don't allow notificaitons to be larger than 4U, even with actions.
Limit BigText template to a fixed number of lines.
Optimize layout of BigText and Inbox for expansion.

Bug: 6457470
Change-Id: Ib7389e16e566df9f91347ca3fdd621916a12af9b
2012-05-11 09:00:45 -07:00
Daniel Sandler
bf6e0ba99d Don't show rotation lock on phone-sized devices.
Bug: 6476409
Change-Id: Ife4476ab08a96337fe78ef2892ac5d73f90b3e8c
2012-05-11 10:41:18 -04:00
satok
bec154c500 Allow the spell checker to remove existing misspelled spans
Bug: 6451163
Change-Id: If018533e8855e9dc21ab2a09ae31aa80ef260b72
2012-05-11 17:34:01 +09:00
Wink Saville
e9aa4b27af Merge "Add additional debug for time zone handling." into jb-dev 2012-05-10 23:05:54 -07:00
satok
37e169cd14 Add a safety net to set range span in the spell checker
Bug: 6476578
Change-Id: I60ad82f80770dcb67fd9663dac64dc81634d7014
2012-05-11 12:56:13 +09:00
Dianne Hackborn
fa61f0b2e2 JellyBean is now 4.1.
Change-Id: Ie37a7c4356d593010686d5dc7d6e715d30099e1e
2012-05-10 19:02:19 -07:00
Mike Lockwood
8d8176d41b Merge "AudioService: Fix problem handling USB audio disconnect" into jb-dev 2012-05-10 17:58:47 -07:00
Mike Lockwood
9841818b9a AudioService: Fix problem handling USB audio disconnect
Also broadcast ACTION_AUDIO_BECOMING_NOISY on USB audio disconnect

Change-Id: I46dfcc744df880066aea6bf651334a081c14af0f
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-05-10 17:49:30 -07:00
Eric Laurent
304521b7cf Merge "AudioService: fix various volume issues." into jb-dev 2012-05-10 17:40:26 -07:00
Raph Levien
467ea51617 Add RobotoCondensed family and optimized Roboto Light.
This adds the Roboto Condensed family (with the name
sans-serif-condensed, for consistency with existing family names).

Change-Id: Ied2c509ebbb2b3b8637c659e62c9a821b6941eaa
2012-05-10 17:28:20 -07:00
Teng-Hui Zhu
4dd9dc8204 Keep the controller when video ended.
Use the media controller as a reminder to the user when the video ended.
We don't quit the video here b/c user may want to replay the video.

bug:5340224
Change-Id: I6d5fdb54bb614277b75e1a18ebe0a7dadd47017e
2012-05-10 17:23:24 -07:00
Eric Laurent
2448201852 AudioService: fix various volume issues.
Fix various issues in adjustStreamVolume() related to stream type aliases
using different ranges.

Always Update last audible index on all streams sharing the same alias.

Add check on setRingerMode() to prevent setting mode to VIBRATE when no
vibrator is present.

Issue 6455831.

Change-Id: Id110e05d2f16e208e1e398922617bf31967b62db
2012-05-10 17:20:26 -07:00
Teng-Hui Zhu
c2b06d5a83 Avoid inline->fullscreen reload for html5 video.
Now when a user start inline play and then switch to full screen, there is no
reload any more.
Basically, we change mediaplayer as a static member, and detect possible
situation to skip the prepare work.

bug:5710646

Change-Id: Ida34cf2e919a6cc8e0d52cd1175d51b5f5d527f7
2012-05-10 16:46:51 -07:00
Brandon Keely
86f23aaa7c Merge "fragment transitions" into jb-dev 2012-05-10 16:46:40 -07:00
Jim Miller
fef47f422a Merge "Fix 6398209: Improve MultiWaveView animations and interaction" into jb-dev 2012-05-10 16:41:55 -07:00
Dianne Hackborn
b1b55e6c6b Fix build.
Change-Id: Ie255c93442d0b62032ac25e6de97f2c03e5df3ba
2012-05-10 16:25:54 -07:00
Wink Saville
26e1a02ba3 Add additional debug for time zone handling.
Change-Id: Ie46bba7e0ef7737a865f7efadbf963c2d14e488f
2012-05-10 16:23:39 -07:00
Brandon Keely
963daf28e5 fragment transitions
Change-Id: I8a3078b32b9543dd1b3a79231c3199f842f3cfd1
2012-05-10 16:18:17 -07:00
Jim Miller
10c66afbd0 Fix 6398209: Improve MultiWaveView animations and interaction
TargetDrawables now have a "home" position they can be scaled about.
Added new "focused" state to TargetDrawable.  This is used to distinguish between highlight and selection.
Updated target icons to use new focused state. Currently re-uses "activated" icon.
Change to event handling to allow cancel events when a target is highlighted to cause a selection.
Cleaned up MultiWaveView initialization code.

MultiWaveView animation improvements:
 - new scale animation when center handle is touched.
 - switched to using indices instead of foreach loops in critical path code to avoid creating temporary objects.
 - updated and simplified animation code.

Change-Id: I593c021475f1644c73bdb9f84855e6a9fec7c0ab
2012-05-10 15:59:03 -07:00
Daniel Sandler
f54bfcf5a3 Merge "Restyling action buttons." into jb-dev 2012-05-10 15:44:16 -07:00
Eric Fischer
4e90bb536a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-10 15:39:07 -07:00
Eric Fischer
6deb7bcad7 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-10 15:37:20 -07:00
Dianne Hackborn
255d1e1540 Merge "Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting..." into jb-dev 2012-05-10 15:32:32 -07:00
Stephen Hines
a25b2e80c7 Test clamp (full and relaxed precision).
BUG=6127576

Change-Id: I9501be7db42daa11dcc71bd619a993c80ef097de
2012-05-10 15:25:11 -07:00
Eric Laurent
24938df9e4 Merge "AudioService: synchronized access to volume index" into jb-dev 2012-05-10 15:20:08 -07:00
Dianne Hackborn
cf67578c7f Fix issue #6475693: OnSystemUiVisibilityChangeListener reporting...
...incorrect visibility when the ActionBar overflow menu is opened

Don't report layout flags in system UI visibility callback.  Update
docs to reflect this.

Change-Id: Icfa411b5537de037cafbcac04991101e8b9138c4
2012-05-10 15:07:24 -07:00
Kenny Root
718af32a19 Merge "Use long instead of int for file offsets" into jb-dev 2012-05-10 14:55:35 -07:00
Eric Laurent
3172d5e3e7 AudioService: synchronized access to volume index
Add synchronization to prevent concurrent accesses to
volume indexes HashMap in VolumeStreamState.

Use ConcurrentHashMap for VolumeStreamState mIndex and
mLastAudibleIndex.

Issue 6421841.

Change-Id: I6dee805a79aa5e2cd0ba4072014a2fcdda4ed507
2012-05-10 14:55:20 -07:00