Nick Kralevich
59477290cc
Merge "AppOpsManager: fix javadoc misspelling."
2013-11-01 22:48:55 +00:00
Nick Kralevich
e20166acfd
AppOpsManager: fix javadoc misspelling.
...
Change-Id: I15cb1ed4c46026db248dc5ebc1d46e65c5f7bc0b
2013-11-01 15:28:29 -07:00
Victoria Lease
6eb3a0e9ba
am 24aecc3f: am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
...
* commit '24aecc3fb609ce999a7fef7a610891d5a32eb92c':
Handle surrogate pairs in Html.toHtml()
2013-11-01 13:34:10 -07:00
Victoria Lease
24aecc3fb6
am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
...
* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
Handle surrogate pairs in Html.toHtml()
2013-11-01 13:30:51 -07:00
Victoria Lease
ee4c84642a
Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
2013-11-01 20:22:42 +00:00
Michael Wright
943345f92a
am d35e94a3: am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev
...
* commit 'd35e94a3cbd27f08430c593930c989a36f17a833':
Only call dump when a ViewRoot actually exists
2013-11-01 13:21:01 -07:00
Michael Wright
d35e94a3cb
am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev
...
* commit '6be8dde6f6447fe56af2a52554bba77ad0ee8d9c':
Only call dump when a ViewRoot actually exists
2013-11-01 13:18:39 -07:00
Michael Wright
4846a93b55
Merge "Only call dump when a ViewRoot actually exists" into klp-dev
2013-11-01 20:11:48 +00:00
Michael Wright
5f48dc7409
Only call dump when a ViewRoot actually exists
...
Bug: 11446494
Change-Id: I47e35d7b4d49d6893ba0c9f8ad05b31f91be85d2
2013-11-01 12:42:49 -07:00
Michael Wright
efdb985f2e
am 9730fbc0: am cd250cc8: am 17d28ca3: Check view and focus invariants after calling into app
...
* commit '9730fbc0ea71ee0c41c94cf2772cc9884455c4e1':
Check view and focus invariants after calling into app
2013-11-01 12:36:28 -07:00
Michael Wright
9730fbc0ea
am cd250cc8: am 17d28ca3: Check view and focus invariants after calling into app
...
* commit 'cd250cc8b781c64df8b8d63853d9082f29a6fc2f':
Check view and focus invariants after calling into app
2013-11-01 12:31:30 -07:00
Michael Wright
17d28ca3d7
Check view and focus invariants after calling into app
...
When we dispatch input events into the actual application, make sure
the input invariants we rely on haven't changed. If they have, we
drop the event and log why.
Bug: 11399505
Change-Id: Id772e41ca41dc332bb02725ab486e3b10a73c220
2013-11-01 19:13:20 +00:00
John Spurlock
43eed4775d
am 9b8145f7: am 17433a63: am b7824a94: Merge "Manage keyguard nav elements using transitions." into klp-dev
...
* commit '9b8145f774b0bcccd0b98b1a830a6434a39f3aa2':
Manage keyguard nav elements using transitions.
2013-11-01 11:56:39 -07:00
John Spurlock
9b8145f774
am 17433a63: am b7824a94: Merge "Manage keyguard nav elements using transitions." into klp-dev
...
* commit '17433a633a3d415fc1932738c0814c3dc6716683':
Manage keyguard nav elements using transitions.
2013-11-01 11:54:32 -07:00
Marco Nelissen
88e82ed2fe
Merge "Use audio focus instead of legacy music command"
2013-11-01 16:54:03 +00:00
Marco Nelissen
71068f6948
Use audio focus instead of legacy music command
...
Bug 8612500
Change-Id: Id443b754d683b9f2d2010ee3a03e54590cda0b48
2013-11-01 16:48:55 +00:00
John Spurlock
56d007b998
Manage keyguard nav elements using transitions.
...
Move the logic for managing dimming the navigation bar
elements on the lockscreen into BarTransitions.
Replace search light + camera assets with new
versions at full brightness, and apply 50% dimming
at runtime, including the IME dismiss button.
Remove unused StatusBarManager _NOP hints.
Improve choreography between camera button +
password security (w/ IME). Fix a few found bugs
in PagedView.
Improve password security unlock transition, manually
fade in back along with the rest of the icons.
Bug:11221659
Change-Id: Ifd1f8c9f400d90542f0ca858b9a4deacabbd518a
2013-11-01 11:33:48 -04:00
Newton Allen
52e3393afd
Merge "Fix some documentation typos."
2013-11-01 02:37:22 +00:00
Jeff Sharkey
e11b6b036b
am b9c28ce9: am 2903d6fa: am c09b6a46: Merge "Better enforcement in DocumentsProvider.call()." into klp-dev
...
* commit 'b9c28ce9d4f5539e2118822750fa008d5fe77c29':
Better enforcement in DocumentsProvider.call().
2013-10-31 18:01:56 -07:00
Jeff Sharkey
b9c28ce9d4
am 2903d6fa: am c09b6a46: Merge "Better enforcement in DocumentsProvider.call()." into klp-dev
...
* commit '2903d6fa19e90ad4546330431e2a26245dc0d5bc':
Better enforcement in DocumentsProvider.call().
2013-10-31 17:59:47 -07:00
Jeff Sharkey
c09b6a46a3
Merge "Better enforcement in DocumentsProvider.call()." into klp-dev
2013-11-01 00:56:26 +00:00
Svetoslav
2a7de4eb8d
am c896147c: am 9eae380b: am a9f28eea: Merge "Temporary detached views not properly reported to accessibility layer." into klp-dev
...
* commit 'c896147c96c020a923711b8a667baf2c881786c0':
Temporary detached views not properly reported to accessibility layer.
2013-10-31 17:55:20 -07:00
Svetoslav
c896147c96
am 9eae380b: am a9f28eea: Merge "Temporary detached views not properly reported to accessibility layer." into klp-dev
...
* commit '9eae380badaa8512fd2c3b0e01a0aff276d3636b':
Temporary detached views not properly reported to accessibility layer.
2013-10-31 17:52:10 -07:00
Svetoslav
a9f28eea36
Merge "Temporary detached views not properly reported to accessibility layer." into klp-dev
2013-11-01 00:44:50 +00:00
Svetoslav
d9ad63b9f7
am 18686894: am acd8741d: am a84e1197: Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev
...
* commit '186868941747b2fad1bdaea973d99ba62686517c':
Uninitialized UiAutomationConnection incorrectly enforces caller id.
2013-10-31 17:38:56 -07:00
Svetoslav
1868689417
am acd8741d: am a84e1197: Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev
...
* commit 'acd8741de6610bf3e2ec5ee682f7baa54d1fc383':
Uninitialized UiAutomationConnection incorrectly enforces caller id.
2013-10-31 17:35:50 -07:00
Svetoslav
a84e1197f5
Merge "Uninitialized UiAutomationConnection incorrectly enforces caller id." into klp-dev
2013-11-01 00:31:02 +00:00
Svetoslav
d4bdd6befa
Temporary detached views not properly reported to accessibility layer.
...
A view may be temporary detached. While in this state the view
state may change for which we fire accessibility events. Clients
use them to know when the view changed and what the change is.
However, detached views do not fire accessibility events.
Hence, a client may hold a stale AccessibilityNodeInfo since
the changes to its source view happened in a temporary detached
state.
bug:11388752
Change-Id: I9052700ca9195841cc2881b65c17f5615e6f71fb
2013-10-31 17:25:06 -07:00
Svetoslav
9663fd09e9
Uninitialized UiAutomationConnection incorrectly enforces caller id.
...
When a client of a UiAutomationConnection is set it remembers its UID
and allows subsequent operations only from this UID. The connection
If the connection was not used, i.e. its client is not set, and an
attempt to destroy it is made the connection enforces the caller UID
to be that of the owner but it does not have an owner yet. Now if the
destroy method is called on a connection that is never used (has no
client) we do not enforce caller UID.
bug:11465888
Change-Id: I739dfc45e772ea970b6ab384e4420184724333a3
2013-10-31 16:28:24 -07:00
Alan Viverette
2ea312c1bf
Merge "Allow styling of fast scroll decorations, add default styles"
2013-10-31 23:16:56 +00:00
Alan Viverette
8636ace696
Allow styling of fast scroll decorations, add default styles
...
Also fixes bad old-style thumb 9-patches.
BUG: 11030706
Change-Id: I51abba952acf87586449fbda329212b435d1d6df
2013-10-31 15:41:31 -07:00
Jim Miller
657b99f177
am ee3b039a: am aa8dbf11: am 43ef1c8c: Merge "Remove deprecated API calls to KeyguardManager from statusbar" into klp-dev
...
* commit 'ee3b039ac679f58a3f34813f6b70798761a406b1':
Remove deprecated API calls to KeyguardManager from statusbar
2013-10-31 15:32:06 -07:00
Jim Miller
ee3b039ac6
am aa8dbf11: am 43ef1c8c: Merge "Remove deprecated API calls to KeyguardManager from statusbar" into klp-dev
...
* commit 'aa8dbf111444435b6071f7b226af5a7bb2a56c52':
Remove deprecated API calls to KeyguardManager from statusbar
2013-10-31 15:30:02 -07:00
Jim Miller
43ef1c8c34
Merge "Remove deprecated API calls to KeyguardManager from statusbar" into klp-dev
2013-10-31 22:22:58 +00:00
Jeff Sharkey
8a2998eade
Better enforcement in DocumentsProvider.call().
...
Use ContentProvider.enforceWritePermissionInner() to handle all edge
cases around checking if caller has write permissions. This fixes
bug where call() would throw if caller and provider were the same app.
Bug: 11464234
Change-Id: Iace8e0e4243d56ed1cdcc9680383103975107036
2013-10-31 14:55:44 -07:00
Svetoslav
7b4bb2f75e
am 4379bd75: am eccfe65f: am 6ce161d1: Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev
...
* commit '4379bd751877056ffa236d0eb8a6cf59b8732d2c':
Cancel current work in PrintDocumentAdatper if printing is cancelled.
2013-10-31 14:51:45 -07:00
Svetoslav
4379bd7518
am eccfe65f: am 6ce161d1: Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev
...
* commit 'eccfe65f9daf459342ebc658b8a40584dfcea016':
Cancel current work in PrintDocumentAdatper if printing is cancelled.
2013-10-31 14:48:22 -07:00
Chet Haase
9f30380db3
am 93830ffb: am df52471c: am 5747919f: Merge "Fix leak in TransitionInflater" into klp-dev
...
* commit '93830ffb1479dad289958c96cc66c11d0efdae34':
Fix leak in TransitionInflater
2013-10-31 14:44:51 -07:00
Chet Haase
93830ffb14
am df52471c: am 5747919f: Merge "Fix leak in TransitionInflater" into klp-dev
...
* commit 'df52471c994f2374ae87ce52dbad61b43e7285e8':
Fix leak in TransitionInflater
2013-10-31 14:42:44 -07:00
Svetoslav
6ce161d176
Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev
2013-10-31 21:42:06 +00:00
Chet Haase
5747919fed
Merge "Fix leak in TransitionInflater" into klp-dev
2013-10-31 21:38:21 +00:00
Jim Miller
a999d463c1
Remove deprecated API calls to KeyguardManager from statusbar
...
Fixes bug 11448304
Change-Id: I3049a20d9320af0425d7a8f08d5aa208e470e292
2013-10-31 14:32:29 -07:00
Svetoslav
d270cb9264
Cancel current work in PrintDocumentAdatper if printing is cancelled.
...
Layout and write may take some time during which the user can
cancel printing. Currently we wait for the last operation,
being write or layout, to complete before closing the print
dialog. Now in such a scenario we request a cancellation of
the ongoing operation.
bug:11329523
Change-Id: Ia9d747163cc73509369a86c8b5afc83b7ee54859
2013-10-31 14:30:58 -07:00
Chet Haase
58ad12208a
Fix leak in TransitionInflater
...
A static map in TransitionInflater keyed off of Context instances,
which could cause contexts/activities to leak over time. This
fix removes that map and simply creates a new inflater each time.
The savings of the cached inflater was minimal an unnecessary, and the
intended sharing is in the context embedded in the inflater anyway.
Issue #11436919 leak in TransitionInflator
Change-Id: Ic05ca47f57723bd572bb6143df4035d66eedf5ad
2013-10-31 14:25:56 -07:00
Jason Monk
c761f3b6d0
am 7c053a2f: am cb134203: am 86f5a149: Merge "Change PacProxySelector to return unresolved addr" into klp-dev
...
* commit '7c053a2fa5b9f280faa03fff63ed2d11d6cf5211':
Change PacProxySelector to return unresolved addr
2013-10-31 11:54:47 -07:00
Jason Monk
7c053a2fa5
am cb134203: am 86f5a149: Merge "Change PacProxySelector to return unresolved addr" into klp-dev
...
* commit 'cb1342032283d1a415eb4f916a79039aa8ed0cbf':
Change PacProxySelector to return unresolved addr
2013-10-31 11:50:07 -07:00
Jason Monk
86f5a1499b
Merge "Change PacProxySelector to return unresolved addr" into klp-dev
2013-10-31 18:43:53 +00:00
Chris Craik
62ac0501c6
am 7595aa94: am 3be09114: am b320f4d5: Merge "Revert "Fixed incorrect calculation of dirty invalidation area"" into klp-dev
...
* commit '7595aa9420cec603674327b9056fc5ad8a6aa191':
Revert "Fixed incorrect calculation of dirty invalidation area"
2013-10-31 11:20:18 -07:00
Jason Monk
179d6e8e20
Change PacProxySelector to return unresolved addr
...
This was found by a bug in Firefox where it expects the addresses from a
ProxySelector to be unresolved. Since ProxySelectorImpl returns unresolved
addresses the PAC version should as well to avoid breaking apps.
The ProxyServer also needed to be updated to reflect this change as it was
expecting a resolved InetSocketAddress.
Bug: 11443853
Change-Id: I3a4e9e248d22d7808603c147660df708e01cdf82
2013-10-31 14:17:48 -04:00
Chris Craik
7595aa9420
am 3be09114: am b320f4d5: Merge "Revert "Fixed incorrect calculation of dirty invalidation area"" into klp-dev
...
* commit '3be09114ca8015be91f34108739b711154f58b77':
Revert "Fixed incorrect calculation of dirty invalidation area"
2013-10-31 11:17:47 -07:00