Joe Onorato
ef9bc11ddb
Merge "Add support for null tag names from apps." into nyc-dev
...
am: 9a916e5
* commit '9a916e5602908f579ac846680270677c5a89e5a4':
Add support for null tag names from apps.
Change-Id: Iff0ce8b4faeb935e70ce9bef6fba322707e5aa7d
2016-04-14 21:17:03 +00:00
Joe Onorato
9a916e5602
Merge "Add support for null tag names from apps." into nyc-dev
2016-04-14 21:10:16 +00:00
Chad Brubaker
69d729b851
Merge "Fix isUserAddedCertificate" into nyc-dev
...
am: 439525a
* commit '439525a99372edcd92e02ca2ec52a0f24b775348':
Fix isUserAddedCertificate
Change-Id: I9a3a3c518fa634be2911848b0c12ed3d62999a6e
2016-04-14 20:54:19 +00:00
Chad Brubaker
439525a993
Merge "Fix isUserAddedCertificate" into nyc-dev
2016-04-14 20:48:53 +00:00
Oren Blasberg
672d0e762d
Merge "Don\'t show icons in overlay popup menus." into nyc-dev
...
am: 203222e
* commit '203222ea6077c1e0155971fee1cb6917b8055117':
Don't show icons in overlay popup menus.
Change-Id: I7abab9b6fb52ca17a811a0917f4955db9c9393e7
2016-04-14 20:46:36 +00:00
Oren Blasberg
203222ea60
Merge "Don't show icons in overlay popup menus." into nyc-dev
2016-04-14 20:34:54 +00:00
Robert Carr
fc20f94702
Merge "PopupWindow. Don\'t use -1 width/height for calculations." into nyc-dev
...
am: 446b4e7
* commit '446b4e727d228caccc635cd69e14fc9faba8ec7f':
PopupWindow. Don't use -1 width/height for calculations.
Change-Id: Ia6381a9c301bb24deaade51afe41bdbdff43e6e2
2016-04-14 19:36:01 +00:00
Rob Carr
446b4e727d
Merge "PopupWindow. Don't use -1 width/height for calculations." into nyc-dev
2016-04-14 19:28:42 +00:00
Amith Yamasani
bb541ffe5e
Merge "Multi-window assist callback" into nyc-dev
...
am: 0d723a2
* commit '0d723a2a4d83db5f01aa5a21f3cbd9d2b608bced':
Multi-window assist callback
Change-Id: I4a0564800bb4c7a19a415ff109836827c4feb0e7
2016-04-14 19:12:57 +00:00
Amith Yamasani
0d723a2a4d
Merge "Multi-window assist callback" into nyc-dev
2016-04-14 19:06:40 +00:00
Joe Onorato
388fc336b3
Add support for null tag names from apps.
...
For Wakelocks and syncs there is no requirement that an app actually
supply a tag/name. Jobs will always have system-supplied tags.
Bug: 26276001
Change-Id: Ie3b8e48a395de1506a2f15d5b9c9eab726bc6d0a
2016-04-14 11:46:56 -07:00
Oren Blasberg
3610d06239
Don't show icons in overlay popup menus.
...
This was a "regression" in CascadingMenuPopup specifically.
We now check for the overflow case and don't show icons.
This preserves the behavior from Marshmallow.
Bug: 28026351
Change-Id: Ifbc9a20b0dadd19ef7b727023b1b0cfa45ebf993
2016-04-14 11:14:09 -07:00
John Reck
fe16c4b105
Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev
...
am: d6a25c2
* commit 'd6a25c2b3e7fd5a98741e2f770cf54d539b29258':
Revert "Revert "Make stopped state a first-class thing""
Change-Id: Iff85c259e93a54c3e3a9db3f3d2b2f826526de0a
2016-04-14 17:47:40 +00:00
John Reck
d6a25c2b3e
Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev
2016-04-14 17:40:52 +00:00
John Reck
8afcc76920
Revert "Revert "Make stopped state a first-class thing""
...
This reverts commit eab3f2658a .
Fixes first-frame issue, mReportNextDraw needs to override
mStopped
Fixes: 28118961
Fixes: 27286867
Change-Id: I5c811759637d08ba9f3b342016d1b3006986d5a2
2016-04-14 10:39:03 -07:00
Chris Craik
8c743b0ee9
Merge "Destroy drawing cache when switching layer type" into nyc-dev
...
am: 2344c6a
* commit '2344c6a2ae0d6ccd650a13aaedb403fa7e3ea579':
Destroy drawing cache when switching layer type
Change-Id: I6b455a94c9fa8219201cc32099493fecf82afafc
2016-04-14 17:12:02 +00:00
Chris Craik
2344c6a2ae
Merge "Destroy drawing cache when switching layer type" into nyc-dev
2016-04-14 17:07:35 +00:00
Alan Viverette
d2bead39e4
Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev
...
am: d51afa4
* commit 'd51afa4525659658b9dbce381761e37a9b931d55':
Update day of week labels when setting month params in SimpleMonthView
Change-Id: I5f0d84e29b69ecbb2b0a86d7859bb614baddc4c0
2016-04-14 16:50:25 +00:00
Robert Carr
6d94ed11db
Merge "Add WindowManager side timeout for toasts." into nyc-dev
...
am: b33daec
* commit 'b33daec8c2e9e12cdb9c7e5db388656fd8aff98f':
Add WindowManager side timeout for toasts.
Change-Id: I95c5eae99da60c47a1986bab07f6b2fe4f550327
2016-04-14 16:50:23 +00:00
Alan Viverette
d51afa4525
Merge "Update day of week labels when setting month params in SimpleMonthView" into nyc-dev
2016-04-14 16:27:34 +00:00
Rob Carr
b33daec8c2
Merge "Add WindowManager side timeout for toasts." into nyc-dev
2016-04-14 16:23:24 +00:00
Adrian Roos
554ffadfb9
Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev
...
am: 82676d9
* commit '82676d9f8810f4ab3e943e89df135cc87857f537':
API Review: Improve javadoc of EXTRA_REMOTE_INPUT
Change-Id: Ic9c091ae358bd55b2d8d4f7ffbb688028cb2cc30
2016-04-14 14:49:45 +00:00
TreeHugger Robot
82676d9f88
Merge "API Review: Improve javadoc of EXTRA_REMOTE_INPUT" into nyc-dev
2016-04-14 14:45:00 +00:00
Alan Viverette
08dbbcdc9b
Update day of week labels when setting month params in SimpleMonthView
...
Bug: 27310206
Change-Id: I40c09fb5dddb202a17ac9c6ecee1d6f40644d9e6
2016-04-14 10:15:04 -04:00
Dan Sandler
73a694b486
Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
...
am: 3af45bd
* commit '3af45bd2d06303bfaf8ba28324ca976e6f96ece3':
Allow system apps to substitute a different app name in notifications.
Change-Id: I5fc24757a4db46a499f5638c04922e131c79d1f9
2016-04-14 13:59:20 +00:00
Gustav Sennton
9e5a25702d
Verify WebView package info before loading WebView
...
am: cd8f273
* commit 'cd8f2737cc550ef1461c74a5c748777fa0c97379':
Verify WebView package info before loading WebView
Change-Id: I75b306ddc59ace1a5d6613a0fbdb0c8c801333c2
2016-04-14 13:59:17 +00:00
Daniel Sandler
3af45bd2d0
Merge "Allow system apps to substitute a different app name in notifications." into nyc-dev
2016-04-14 13:53:19 +00:00
Dan Sandler
732bd6cb27
Allow system apps to substitute a different app name in notifications.
...
This is a privileged permission and is only to be used by
the core OS and related packages whose names are confusing
or misleading when shown in notifications.
The user will always be able to see the true package name by
accessing the notification inspector (longpress or swipe
gesture on the notification row in SystemUI).
Fixes: 26517701
Change-Id: I2b021c9da0757b99df76399666af263668d88070
2016-04-14 13:48:03 +00:00
Gustav Sennton
cd8f2737cc
Verify WebView package info before loading WebView
...
To ensure that the package we are using to load WebView is a valid
provider we need to verify this before loading WebView - not only when
choosing what package to use.
Bug: 27900925
Change-Id: If57ca32a7a3fa08735a3b8ea9ed268c1bb1b8ede
2016-04-14 14:19:07 +01:00
Niels Egberts
3feb21c44f
Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev
...
am: e767e1b
* commit 'e767e1bc17eeb4302ef503bcc83ed8697db91433':
Fix issue when QUEUE_DESTROY arrive at the same time.
Change-Id: Ic1d42d8b74ec27be4a3d57c3df8c221d5907c739
2016-04-14 12:39:21 +00:00
Niels Egberts
e767e1bc17
Merge "Fix issue when QUEUE_DESTROY arrive at the same time." into nyc-dev
2016-04-14 12:33:05 +00:00
Erik Kline
886d17c035
Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev
...
am: 0628d32
* commit '0628d324d0f1c2116c051faadd8e4bf26206b1a6':
Also log IPv4 and IPv6 connectivity of any previous default network
Change-Id: Ibcbd79a6674cf062138ccbd031d14721b0367e22
2016-04-14 10:20:17 +00:00
TreeHugger Robot
0628d324d0
Merge "Also log IPv4 and IPv6 connectivity of any previous default network" into nyc-dev
2016-04-14 10:14:20 +00:00
Clara Bayarri
bdcd8dce23
Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
...
am: 6e58549
* commit '6e5854974098e4e2f734510e7dd8221a324f34ad':
Provide startIntentSenderForResult for fragments
Change-Id: I363540141afa80476fe0db79103c0df08794a5ae
2016-04-14 10:11:15 +00:00
Clara Bayarri
6e58549740
Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
2016-04-14 10:05:35 +00:00
Bernard Chau
d17b3013ce
Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev
...
am: 25c43b7
* commit '25c43b78d11f74e98ba9d5f541647aa5ed44ebce':
Includes both direct boot aware and unaware apps in Apps default view
Change-Id: I23eeef915a4607aa387e826056056cb7632a4542
2016-04-14 09:45:55 +00:00
Bernard Chau
25c43b78d1
Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev
2016-04-14 09:40:00 +00:00
Erik Kline
48f12f2ad6
Also log IPv4 and IPv6 connectivity of any previous default network
...
Change-Id: I07595c0a131fea21914f524949cd64af87403b88
2016-04-14 17:54:46 +09:00
Hugo Benichi
39de1e2de5
Merge "Add DHCP error event class and record DHCP errors." into nyc-dev
...
am: fc18b6f
* commit 'fc18b6f3608d87f3dc53cda8d8db30636c92d6e9':
Add DHCP error event class and record DHCP errors.
Change-Id: I5b9ef8b191ab0ef4349ed00c1d8f548393aba368
2016-04-14 08:08:54 +00:00
Hugo Benichi
fc18b6f360
Merge "Add DHCP error event class and record DHCP errors." into nyc-dev
2016-04-14 08:01:31 +00:00
Pierre Imai
f8ef3c36a9
Merge changes Ia71865a9,I40b6de54 into nyc-dev
...
am: 1feca76
* commit '1feca76bd48008aa3421c8741cb147ecc1a6e912':
Log an event whenever we lose the default network.
Record the transport types for connectivity events.
Change-Id: I2aea598dd2926c18fdb4e6301759539c504038dc
2016-04-14 07:31:38 +00:00
Pierre Imai
1feca76bd4
Merge changes Ia71865a9,I40b6de54 into nyc-dev
...
* changes:
Log an event whenever we lose the default network.
Record the transport types for connectivity events.
2016-04-14 07:25:34 +00:00
Hugo Benichi
6241874355
Add DHCP error event class and record DHCP errors.
...
This patch adds an event class derived from IpConnectivityEvent that
records parsing errors of DHCP response packets.
Change-Id: I19516cf05e3419c4262e3236899e52987e5f2264
2016-04-14 15:40:10 +09:00
Pierre Imai
6b4e15b155
Record the transport types for connectivity events.
...
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
2016-04-14 15:38:17 +09:00
Zhijun He
a19762765d
Merge "Camera: clarify lens shading map" into nyc-dev
...
am: 15aac69
* commit '15aac69c8f16e5edd62fd6557cf6ffb5e04b351e':
Camera: clarify lens shading map
Change-Id: I403577261078949cb30c0a66390e833108d3b98f
2016-04-14 05:26:18 +00:00
Zhijun He
15aac69c8f
Merge "Camera: clarify lens shading map" into nyc-dev
2016-04-14 05:20:45 +00:00
Yuki Awano
b28d871a8d
Do not update accessibilityTitle in LayoutParams.setTitle
...
am: 0697c7a
* commit '0697c7a877d87acd572ed7ce62472d5866375e86':
Do not update accessibilityTitle in LayoutParams.setTitle
Change-Id: I006620e1ac9c8571dd698f45da75284010dc58e9
2016-04-14 04:21:55 +00:00
Yuki Awano
0697c7a877
Do not update accessibilityTitle in
...
LayoutParams.setTitle
Bug: 28126629
Change-Id: Idfd8c0210d32e1a0e9c16272cfbb35ef6065e805
2016-04-14 04:16:18 +00:00
Erik Kline
48f8f2951b
Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev
...
am: f824e58
* commit 'f824e58d493bb86789bcb8de27a2e43a762c5d3e':
Add some more metrics: IpManager, IpReachabilityMonitor
Change-Id: Icc62c058b26a8b31f3651569371dbb231cef4502
2016-04-14 03:27:17 +00:00
TreeHugger Robot
f824e58d49
Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev
2016-04-14 03:20:40 +00:00