139354 Commits

Author SHA1 Message Date
Adam Powell
6bb10554ba Allow action bar navigation icon resource id of 0
Fix a bug preventing this from being treated properly.

Bug 15458868

Change-Id: Ib1a7def482755757e524dfddd1eb6a02522c5d6b
2014-06-11 19:57:12 -07:00
Robert Greenwalt
130669992c Fix build breakage.
Change-Id: Ideb32704ce5dc37ef36b05609f88da2aa55b3a00
2014-06-11 18:06:55 -07:00
Adam Powell
263a2d658b Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Adam Powell
360c1d8922 Enable collapsing empty Toolbar-based ActionBars above tabs
Fixes a regression where Toolbar ActionBars would hold empty space
when previous platform versions would collapse to tabs-only.

Bug 15573337

Change-Id: I6da379d2ed58e8ba8cadcd727606c7fc160ecf91
2014-06-11 19:31:41 -07:00
Chris Craik
0adb6d6e50 Merge "Limit path approximation recursion depth" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Chris Craik
9c3dd62d0f Limit path approximation recursion depth
bug:15369119
Change-Id: I6f009f5e8790129e1aa8a51e1fc6cdd1415dd617
2014-06-11 17:24:51 -07:00
Robert Greenwalt
55213c8022 Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Sreeram Ramachandran
6307b35e1d Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit 7d3b4b9a3d4de9673119632da0ebd583e50126f7)
2014-06-11 16:32:21 -07:00
Robert Greenwalt
9c1b8af720 Merge "Make IpPrefix final." 2014-06-11 21:23:31 +00:00
Robert Greenwalt
0cbe94a349 Make IpPrefix final.
Couldn't resolve a merge conflict, so skipped and make the change this way.

Change-Id: Ib043f660fca2090f0d12a5a707e5e1ad28f76adb
2014-06-12 12:57:19 -07:00
Robert Greenwalt
9468ddee2d Merge "Missed an api update." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Robert Greenwalt
10e049b651 Missed an api update.
Fix build.

Change-Id: I2563ec3c26e1c8dbb9abea9f87537a87ce5fda41
2014-06-11 16:57:03 -07:00
Robert Greenwalt
f09d128517 Merge "Fix wifi connectivity issues." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Sreeram Ramachandran
fb7690d4e1 Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
2014-06-11 23:02:59 +00:00
Selim Cinek
98751ac6d3 Merge "Introduced fading views for the camera interaction on the lockscreen." into lmp-preview-dev 2014-06-11 15:57:38 +00:00
Selim Cinek
1aed973665 Introduced fading views for the camera interaction on the lockscreen.
Bug: 15126905
Change-Id: I82b0050a4216873d9cd191b32d1e5bf6871acbd6
2014-06-12 03:33:14 +00:00
Santos Cordon
d5bb622553 Merge "Support conference calling. (1/4)" 2014-06-11 08:41:11 +00:00
Jinsuk Kim
0340bbc89f RoutingControlAction for HdmiControlService
Routing control action is initiated in various cases, such as manual
TV input port switching, routing change of a different CEC switch,
and so on. The action determines the device to be a new active source.

Change-Id: I1efcd6ff1919dd94d6fa0e0ffa6e430c48d4e9c6
2014-06-12 23:40:05 +00:00
Selim Cinek
056396edbf am 02faebd2: Merge "Fixed the calculation of the clipTopAmount which lead to holes." into lmp-preview-dev
* commit '02faebd2bab4524e9ba0c9fcd288ad1a09f8feef':
  Fixed the calculation of the clipTopAmount which lead to holes.
2014-06-12 23:37:49 +00:00
Santos Cordon
b693998fdf Support conference calling. (1/4)
Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
2014-06-12 16:15:09 -07:00
Craig Mautner
a46ac5094e Merge "Do not display unsecure windows behind dialogs" 2014-06-12 17:09:07 +00:00
Dianne Hackborn
60a0cd3df9 am 8840d6b9: Merge "Remove landscape and tablet animations." into lmp-preview-dev
* commit '8840d6b978cf3616a871e50bbbb055a51bbfc1a2':
  Remove landscape and tablet animations.
2014-06-12 23:20:57 +00:00
Amith Yamasani
76f7e7ee20 am 54b3006b: Merge "Undo some API changes that affect third party launcher writers" into lmp-preview-dev
* commit '54b3006b6340a2a311acb8f70d4602506e63b1ae':
  Undo some API changes that affect third party launcher writers
2014-06-12 23:16:47 +00:00
Tim Murray
eb2b52ffaf am 604ea0e4: am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit."
* commit '604ea0e415faa2466ab6c89372001d6c93ad0d98':
  Move FieldPacker over to use large objects on 64-bit.
2014-06-12 23:13:28 +00:00
Jinsuk Kim
a6ce7708d6 DeviceSelectAction for HdmiControlService
DeviceSelectAction is the main handler for the API deviceSelect() which is
used to choose a new active source among logical devices on the bus.

Change-Id: I77582a1f873423fc316d89f67a89a867461a76b2
2014-06-12 23:06:29 +00:00
Adam Powell
85c262772d am d3b9bac6: Merge "Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout" into lmp-preview-dev
* commit 'd3b9bac6a96a065cd4058429569e0ed6ec4df032':
  Fix incorrect dispatch of empty WindowInsets from ActionBarOverlayLayout
2014-06-12 22:51:53 +00:00
Amith Yamasani
962c7b14ea am 8f7c6f07: Merge "Rename "Android for Work" to "Android Work"" into lmp-preview-dev
* commit '8f7c6f079d008d76fb3876db29a78c642e74a7dd':
  Rename "Android for Work" to "Android Work"
2014-06-12 22:51:40 +00:00
Matthew Williams
748a0ebf6b am 00768c4d: Merge "JobScheduler blocking main thread." into lmp-preview-dev
* commit '00768c4dc67aed2f156184e9544b869cb80cdd50':
  JobScheduler blocking main thread.
2014-06-12 22:51:32 +00:00
Chris Craik
bd2d97f2b7 am 9de2a8f4: Merge "Add AA flag to TessellationCache key" into lmp-preview-dev
* commit '9de2a8f42d88e50146947a7bf21b212ea134ee83':
  Add AA flag to TessellationCache key
2014-06-12 22:51:27 +00:00
John Spurlock
4cf5fc2e65 am c4288bbd: Merge "PowerUI: dismiss warning notifications when falling back." into lmp-preview-dev
* commit 'c4288bbd56d6b89ffd9534bd78b17b491d131b3f':
  PowerUI: dismiss warning notifications when falling back.
2014-06-12 22:31:27 +00:00
John Spurlock
6cf5f8026e am 85231047: Merge "PowerUI: Remove obsolete workaround." into lmp-preview-dev
* commit '85231047078a79a0ed465ce15bd7e34740d8eb73':
  PowerUI: Remove obsolete workaround.
2014-06-12 22:31:22 +00:00
Chris Wren
d2d05f5b9e am f975e308: Merge "Fix notification update path for structural updates." into lmp-preview-dev
* commit 'f975e3080447fa0b8dc6110329b669ae3838f202':
  Fix notification update path for structural updates.
2014-06-12 22:31:13 +00:00
Robert Greenwalt
52a327263d am 2d0ab42b: Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev
* commit '2d0ab42b1420db884d26fd2ef22710b5a887e9a6':
  Apply API Council comments to ConnectivityManager
2014-06-12 22:31:07 +00:00
Sol Boucher
a13697f68d am 85d82c70: camera2: Remove stray </p> in CameraDevice#createCaptureSession
* commit '85d82c70e1766c5a38c65fdfda8304aefcaa6576':
  camera2: Remove stray </p> in CameraDevice#createCaptureSession
2014-06-12 22:31:01 +00:00
Ihab Awad
ce2d2822f9 am 5993e2d0: (-s ours) Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)" into lmp-preview-dev
* commit '5993e2d0fa5807e6b58ad559ee94befd09b82431':
  DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)
2014-06-12 22:30:53 +00:00
Craig Mautner
c9457faeb6 Do not display unsecure windows behind dialogs
If a dialog activity has FLAG_SHOW_WHEN_LOCKED set it will dismiss
the keyguard. Previously this would expose any full screen unsecure
windows behind the dialog. With this fix the dialog is displayed
over the wallpaper.

Fixes bug 15006623.

Change-Id: I85a6713c7647db52211bd0f7280010e859723710
2014-06-12 13:55:33 -07:00
Dianne Hackborn
099053d862 Merge "Remove landscape and tablet animations." into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Dianne Hackborn
62271c7fac Remove landscape and tablet animations.
Change-Id: I2258649925a9ca897fbd808aaca897b0633ba2e8
2014-06-12 16:02:48 -07:00
Chris Craik
0c447bf3b2 Merge "Add AA flag to TessellationCache key" into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Chris Craik
ed4ef0bc17 Add AA flag to TessellationCache key
bug:15539571
Change-Id: I7cf470ca962041ab3c00c740e87c6ae9a95f06a8
2014-06-12 13:39:34 -07:00
Chris Wren
20d3ba200a Merge "Fix notification update path for structural updates." into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Chris Wren
1dafd04247 Fix notification update path for structural updates.
Similar logic is required for the replacement case, as is already in place
for the update case, although the actions are different.

Bug: 15588056
Change-Id: I9ad115237c589716772e569fa1979a206b77097b
2014-06-12 13:51:51 -04:00
Amith Yamasani
a5d80b39e8 Merge "Rename "Android for Work" to "Android Work"" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Amith Yamasani
4ea915e71a Rename "Android for Work" to "Android Work"
Bug: 15588476
Change-Id: I3c3d12983352d7ddc1cb87ef41deddbb62df3f0a
2014-06-12 13:53:23 -07:00
Matthew Williams
78b9654311 Merge "JobScheduler blocking main thread." into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Matthew Williams
49a85b64f7 JobScheduler blocking main thread.
Bug:15589789
Fixed deadlock from lock ordering.

Also, before doing I/O we now copy the list of jobs with the lock, but release
the lock before starting the write.

Change-Id: I1ed6141be8fc506abe2684d2894b255c714e29ba
2014-06-12 12:40:42 -07:00
Robert Greenwalt
a83ce3451d Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev 2014-06-12 03:30:50 +00:00
Robert Greenwalt
6078b50b01 Apply API Council comments to ConnectivityManager
rename isNetworkActive -> isDefaultNetworkActive
rename registerNetworkActiveListener -> registerDefaultNetworkActiveListener
make listenForNetwork/requestNetwork take a NetworkRequest
rename NetworkCallbackListener -> NetworkCallback
rename listenForNetwork -> registerNetworkCallback
rename releaseNetworkRequest -> unregisterNetworkCallback
remove NetworkRequest param from NetworkCallback functions
rename onNetworkCapabilitiesChagned to onCapabilitiesChanged
remove onReleased
change time units in onLosing from Sec -> ms

bug: 15142362
Change-Id: Ibc96e3f461706efe1eafa0d85605249cfd6e9fdd
2014-06-11 23:17:46 -07:00
Yohei Yukawa
13592c623c Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev 2014-06-10 22:36:02 +00:00
Yohei Yukawa
04fcf1cabe Merge "Show IME-related system IME dialogs over windows owned by the IME" 2014-06-10 22:29:12 +00:00