Adrian Ludwig
23746be026
Merge "Reorganizing permissions into groups oriented around user-understandable concepts." into jb-dev
2012-05-03 11:18:24 -07:00
Chet Haase
d34dd71800
Fix hang/crash in native path code
...
An optimization for paths is to only create a texture for the original native
Path object, and have all copies of that object use that texture. This works in
most cases, but sometimes that original path object may get destroyed (when the
SDK path object is finalized) while we are still referencing and using that object
in the DisplayList code. This causes undefined errors such as crashes and hanging
as we iterate through the operations of a destroyed (and garbage-filled) path object.
The fix is to use the existing ResourceCache to refcount the original path until
we are done with it.
Issue #6414050 Analytics Dogfood App crashes reliably on Jellybean
Change-Id: I5dbec5c069f7d6a1e68c13424f454976a7d188e9
2012-05-03 11:14:50 -07:00
Adam Powell
5da992bb76
am b8eba14f: am 43b8fd76: Merge "Fix nested cross-scrolling for ScrollView/HorizontalScrollView" into jb-dev
...
* commit 'b8eba14f133997f3ab6de490afd2e4fad55913e8':
Fix nested cross-scrolling for ScrollView/HorizontalScrollView
2012-05-03 11:06:14 -07:00
Gilles Debunne
7c5de58c2c
am 449fa826: am 57e6136c: Merge "Hide TextDirectionHeuristics" into jb-dev
...
* commit '449fa82612deb196e705cbf97460c98b612edc39':
Hide TextDirectionHeuristics
2012-05-03 11:06:12 -07:00
Adam Powell
836021143d
am e43a4e90: am f27ba974: Merge "JB API cleanup; ActionMode and View docs" into jb-dev
...
* commit 'e43a4e90173cdb1a8e22a8e8e05356c12df44a0e':
JB API cleanup; ActionMode and View docs
2012-05-03 11:03:24 -07:00
Adam Powell
844bcc3a04
am c420d268: am 1f2077c3: Merge "Fix AlertDialog positioning for dialogs spawned from DialogWhenLarge activities" into jb-dev
...
* commit 'c420d268de68a5ec08f20a512226b46495502121':
Fix AlertDialog positioning for dialogs spawned from DialogWhenLarge activities
2012-05-03 11:03:23 -07:00
Adam Powell
b8eba14f13
am 43b8fd76: Merge "Fix nested cross-scrolling for ScrollView/HorizontalScrollView" into jb-dev
...
* commit '43b8fd76c03fe4d3c46919e98af91a18176c2654':
Fix nested cross-scrolling for ScrollView/HorizontalScrollView
2012-05-03 11:02:56 -07:00
Gilles Debunne
449fa82612
am 57e6136c: Merge "Hide TextDirectionHeuristics" into jb-dev
...
* commit '57e6136ce79241348b3563c4368a327ca2906610':
Hide TextDirectionHeuristics
2012-05-03 11:02:55 -07:00
Eino-Ville Talvala
951516358e
Update docs for YV12 format and camera preview callbacks.
...
- Define stride for YV12 when using it for preview callbacks
- Include equations for calculating stride and start indexes of Y, U,
and V planes for YV12.
- Add more cross-references so that equations are easier to find.
Bug: 6330501
Change-Id: I85a78757ec767d08173b9fe714adb715835244b4
2012-05-03 11:02:18 -07:00
Adam Powell
43b8fd76c0
Merge "Fix nested cross-scrolling for ScrollView/HorizontalScrollView" into jb-dev
2012-05-03 11:00:53 -07:00
Gilles Debunne
57e6136ce7
Merge "Hide TextDirectionHeuristics" into jb-dev
2012-05-03 11:00:49 -07:00
Adam Powell
e43a4e9017
am f27ba974: Merge "JB API cleanup; ActionMode and View docs" into jb-dev
...
* commit 'f27ba974d5af68baf071282de65a22ca6e59244c':
JB API cleanup; ActionMode and View docs
2012-05-03 11:00:20 -07:00
Adam Powell
c420d268de
am 1f2077c3: Merge "Fix AlertDialog positioning for dialogs spawned from DialogWhenLarge activities" into jb-dev
...
* commit '1f2077c3a0ae20caa4343dc9f66db959a939a054':
Fix AlertDialog positioning for dialogs spawned from DialogWhenLarge activities
2012-05-03 11:00:18 -07:00
Adam Powell
f27ba974d5
Merge "JB API cleanup; ActionMode and View docs" into jb-dev
2012-05-03 10:58:48 -07:00
Adam Powell
1f2077c3a0
Merge "Fix AlertDialog positioning for dialogs spawned from DialogWhenLarge activities" into jb-dev
2012-05-03 10:57:22 -07:00
Wink Saville
1d7c1f1117
Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow.
...
Change-Id: I01c73a0afaa17793f9dea1b78c9fe49fa138f787
2012-05-03 10:34:57 -07:00
Amith Yamasani
68d3f58674
am 48306353: am c793d626: Merge "On first boot and NTP lookup, set the time even if it\'s not off by 5+ secs." into jb-dev
...
* commit '48306353ef315db72e1d3cf898b67dae5d990210':
On first boot and NTP lookup, set the time even if it's not off by 5+ secs.
2012-05-03 10:30:56 -07:00
Amith Yamasani
48306353ef
am c793d626: Merge "On first boot and NTP lookup, set the time even if it\'s not off by 5+ secs." into jb-dev
...
* commit 'c793d62613b8cee340ce6c20856f6db81575f034':
On first boot and NTP lookup, set the time even if it's not off by 5+ secs.
2012-05-03 10:28:22 -07:00
Amith Yamasani
c793d62613
Merge "On first boot and NTP lookup, set the time even if it's not off by 5+ secs." into jb-dev
2012-05-03 10:19:40 -07:00
John Reck
b3d30e444d
am 7ecf3dc6: am eaca069a: Merge "Fix clicking on a fake element (address, phone number, etc..)" into jb-dev
...
* commit '7ecf3dc6fc6ae4a152e19fe6be14787c6372cb9f':
Fix clicking on a fake element (address, phone number, etc..)
2012-05-03 10:05:06 -07:00
Wu-cheng Li
f05c1d63d1
Avoid deadlocks when calling autoFocus from onAutoFocus callback.
...
Applicatons may use different threads for calling autoFocus and
onAutoFocus callback.
bug:6026574
Change-Id: I114a60240e22af15ca469b591e080121367db8e2
2012-05-04 01:01:46 +08:00
John Reck
7ecf3dc6fc
am eaca069a: Merge "Fix clicking on a fake element (address, phone number, etc..)" into jb-dev
...
* commit 'eaca069aff710eb8776669bd5d8016d10b7d2467':
Fix clicking on a fake element (address, phone number, etc..)
2012-05-03 10:01:26 -07:00
John Reck
eaca069aff
Merge "Fix clicking on a fake element (address, phone number, etc..)" into jb-dev
2012-05-03 09:59:46 -07:00
John Reck
9155cbac78
Fix clicking on a fake element (address, phone number, etc..)
...
Bug: 6426909
Change-Id: Ic45deea2423dbeb2bcb4ecbcaac32ec194f7511e
2012-05-03 09:51:32 -07:00
Irfan Sheriff
4639e577c9
am 04e2b223: am 531522c7: Merge "Report open networks without saved networks" into jb-dev
...
* commit '04e2b223175483c5ee6882394b574461a45bdfeb':
Report open networks without saved networks
2012-05-03 09:47:07 -07:00
Irfan Sheriff
04e2b22317
am 531522c7: Merge "Report open networks without saved networks" into jb-dev
...
* commit '531522c7fe0b4b7bccd34dcaf2179c4a8ced619c':
Report open networks without saved networks
2012-05-03 09:44:08 -07:00
George Mount
ea182174ad
am 5b6726fa: am aac5066d: Merge "Add intercept path for UI touch handling." into jb-dev
...
* commit '5b6726fab1bfb9305c938af805be7bcf96193a62':
Add intercept path for UI touch handling.
2012-05-03 09:42:15 -07:00
Irfan Sheriff
531522c7fe
Merge "Report open networks without saved networks" into jb-dev
2012-05-03 09:42:06 -07:00
Wink Saville
cb2dd42a5d
am 2efec653: am 9a992450: Merge "Time can become incorrect when no sim is present or mcc changes." into jb-dev
...
* commit '2efec653a5cbeb3f302f44c478d60110b1e762ed':
Time can become incorrect when no sim is present or mcc changes.
2012-05-03 09:39:47 -07:00
George Mount
5b6726fab1
am aac5066d: Merge "Add intercept path for UI touch handling." into jb-dev
...
* commit 'aac5066dbf17987887dc46d90df1ce465d0c4c50':
Add intercept path for UI touch handling.
2012-05-03 09:39:20 -07:00
George Mount
aac5066dbf
Merge "Add intercept path for UI touch handling." into jb-dev
2012-05-03 09:37:18 -07:00
Wink Saville
2efec653a5
am 9a992450: Merge "Time can become incorrect when no sim is present or mcc changes." into jb-dev
...
* commit '9a992450cb0b48ea2a0bb946d321b3afbc27aad5':
Time can become incorrect when no sim is present or mcc changes.
2012-05-03 09:37:00 -07:00
Wink Saville
9a992450cb
Merge "Time can become incorrect when no sim is present or mcc changes." into jb-dev
2012-05-03 09:35:27 -07:00
John Reck
4f1fa1bb44
am 58e7dc96: am d4796461: Fix accessibility drawing
...
* commit '58e7dc96a8c94b215f274e91e5bab9f292e803f2':
Fix accessibility drawing
2012-05-03 09:27:27 -07:00
Daniel Sandler
71a5468c01
am e06938be: am 5380cdc2: Merge "Hide icons for low-priority notifications." into jb-dev
...
* commit 'e06938bea4ef71a2861cae3b95500ad783674995':
Hide icons for low-priority notifications.
2012-05-03 09:27:25 -07:00
Wink Saville
f0f43227a7
Time can become incorrect when no sim is present or mcc changes.
...
bug: 6393147
Change-Id: I07ad74998b03af532ccf704a8a7e4844f5829b14
2012-05-03 09:26:25 -07:00
John Reck
58e7dc96a8
am d4796461: Fix accessibility drawing
...
* commit 'd4796461ee29c2d2560412dbb51e0c931aa22db5':
Fix accessibility drawing
2012-05-03 09:24:26 -07:00
Daniel Sandler
e06938bea4
am 5380cdc2: Merge "Hide icons for low-priority notifications." into jb-dev
...
* commit '5380cdc2e1adc8511b05e7623efb44d67be88418':
Hide icons for low-priority notifications.
2012-05-03 09:24:21 -07:00
John Reck
d4796461ee
Fix accessibility drawing
...
Bug: 6407623
If script injection is disabled, the accessibility injector works
by modifying the text selection. However, this would cause WebView
to go into text selection mode, showing the CAB and such, which
we don't want. Add a flag saying WHY text selection is being changed
so that we can respond accordingly in WebViewClassic.
Change-Id: Ia509def3fcdb022b93fbbc7ed89bc9558663afd3
2012-05-03 09:07:11 -07:00
Jean-Baptiste Queru
00f94e88f9
Merge "Enable chromium http stack for x86"
2012-05-03 09:02:15 -07:00
George Mount
7a33acf123
Add intercept path for UI touch handling.
...
Bug 6410164
Change-Id: Ia3907a9a57321d0f25763c88fd0c0a7617d5da48
2012-05-03 09:02:14 -07:00
Daniel Sandler
5380cdc2e1
Merge "Hide icons for low-priority notifications." into jb-dev
2012-05-03 08:28:25 -07:00
Daniel Sandler
58b173b1ca
Hide icons for low-priority notifications.
...
Anything below PRIORITY_LOW will usually be hidden (unless
the NotificationManagerService has a compelling reason to
adjust the priority).
Bug: 6357857
Change-Id: Ic8a806a6db87b0473014a5d006279991272a44ea
2012-05-03 11:25:29 -04:00
Daniel Sandler
81d13d5316
am 60804ab2: am c5d76e04: Merge "Move bar panels above the system bar window layer." into jb-dev
...
* commit '60804ab2e861e95cef9419280a8f3cc8405e7263':
Move bar panels above the system bar window layer.
2012-05-03 08:07:57 -07:00
Daniel Sandler
60804ab2e8
am c5d76e04: Merge "Move bar panels above the system bar window layer." into jb-dev
...
* commit 'c5d76e041ab45c97d74fe93cb52e7fbc912b3ef6':
Move bar panels above the system bar window layer.
2012-05-03 08:05:24 -07:00
Daniel Sandler
c5d76e041a
Merge "Move bar panels above the system bar window layer." into jb-dev
2012-05-03 08:02:56 -07:00
Daniel Sandler
4ce64fb364
Move bar panels above the system bar window layer.
...
We use the new TYPE_NAVIGATION_BAR_PANEL for this instead of
TYPE_STATUS_BAR_PANEL (which is indeed above the status bar,
but far below the navigation bar, which is the window type
used for the system bar now.)
Bug: 6319161 (ticker underneath system bar)
Bug: 6437342 (missing clear all button on system bar)
Change-Id: Ib58c0003c4c81db64edca2c1bbc2d764c3237ed0
2012-05-03 10:53:10 -04:00
Chris Wren
e1cb5e0674
am 6145ec08: am 1243b967: Merge "rework big text to handle gmail use case" into jb-dev
...
* commit '6145ec08372940e3d0b84b68a5acd6c496217d4a':
rework big text to handle gmail use case
2012-05-03 07:51:41 -07:00
Chris Wren
b323cc47ef
am 6908d1f6: am 71964645: Merge "Allow the Notification.Builder to carry around a Style to apply at build" into jb-dev
...
* commit '6908d1f6d4aa441652563544a53189df5395b664':
Allow the Notification.Builder to carry around a Style to apply at build
2012-05-03 07:51:39 -07:00
Chris Wren
6145ec0837
am 1243b967: Merge "rework big text to handle gmail use case" into jb-dev
...
* commit '1243b967595c72f0efafae5efea7d33314efe0b1':
rework big text to handle gmail use case
2012-05-03 07:48:03 -07:00