OSDN Git Service
Hugo Benichi [Sat, 22 Apr 2017 01:07:59 +0000 (01:07 +0000)]
Merge changes I5187d17c,I49a76582 am:
7781a6d4c1 am:
f2e5cf715d am:
31259c219f
am:
bcdf1214c7
Change-Id: I63b2fe14fe830b1000414328e79bee8c8233d40f
Hugo Benichi [Sat, 22 Apr 2017 01:06:17 +0000 (01:06 +0000)]
Merge "NsdManager: add unit tests" am:
dc54ad7fc3 am:
40ab8401b2 am:
d2181235b9
am:
658f2e5cd7
Change-Id: I86a9db7fe4f925162e1632152862c7b246230db9
Hugo Benichi [Sat, 22 Apr 2017 00:59:36 +0000 (00:59 +0000)]
Merge changes I5187d17c,I49a76582 am:
7781a6d4c1 am:
f2e5cf715d
am:
31259c219f
Change-Id: I174179db3a08ba51aef737cfb3956d1cf789b362
Hugo Benichi [Sat, 22 Apr 2017 00:57:48 +0000 (00:57 +0000)]
Merge "NsdManager: add unit tests" am:
dc54ad7fc3 am:
40ab8401b2
am:
d2181235b9
Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235
Sudheer Shanka [Sat, 22 Apr 2017 00:57:13 +0000 (00:57 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev am:
9ebd87de8e
am:
cf0f217d1b
Change-Id: Id118ce161b034c524bbb8d7ce5a3296f5e69eb26
Hugo Benichi [Sat, 22 Apr 2017 00:51:03 +0000 (00:51 +0000)]
Merge changes I5187d17c,I49a76582 am:
7781a6d4c1
am:
f2e5cf715d
Change-Id: Ia7298c92e50e00e139829498af00d80a5840d4cb
Hugo Benichi [Sat, 22 Apr 2017 00:49:19 +0000 (00:49 +0000)]
Merge "NsdManager: add unit tests" am:
dc54ad7fc3
am:
40ab8401b2
Change-Id: Ie8b30310a8da64e6247472fa17945d003b1894e8
Sudheer Shanka [Sat, 22 Apr 2017 00:48:36 +0000 (00:48 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev
am:
9ebd87de8e
Change-Id: I95b0d92677d192dbf80271a22bb73a71c47021a6
Dianne Hackborn [Sat, 22 Apr 2017 00:47:37 +0000 (00:47 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev am:
e3cc9287ac
am:
626a97618e
Change-Id: I280c45eff7eda9a036c2165b418f7672a5544ad4
Hugo Benichi [Sat, 22 Apr 2017 00:43:07 +0000 (00:43 +0000)]
Merge changes I5187d17c,I49a76582
am:
7781a6d4c1
Change-Id: I9c484916a9e8adf11342c01b77077e8016a29b5f
Hugo Benichi [Sat, 22 Apr 2017 00:40:56 +0000 (00:40 +0000)]
Merge "NsdManager: add unit tests"
am:
dc54ad7fc3
Change-Id: I928f19e359b7423d43d792c413de4195a64141a7
Dianne Hackborn [Sat, 22 Apr 2017 00:39:09 +0000 (00:39 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev
am:
e3cc9287ac
Change-Id: I8801bb55abacae1aa2f1cf4d109087dc0209e4cf
Hall Liu [Sat, 22 Apr 2017 00:38:29 +0000 (00:38 +0000)]
Merge "Merge "Remove default public ctor from RttModifyStatus" am:
d065cf049e am:
cb93ac533d am:
f2a3b8af49" into oc-dev-plus-aosp
am:
54488bdb8c
Change-Id: Ic4125b316562a6396eb3e7dff98050e82591b845
Sudheer Shanka [Sat, 22 Apr 2017 00:34:36 +0000 (00:34 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev
Hugo Benichi [Sat, 22 Apr 2017 00:34:07 +0000 (00:34 +0000)]
Merge changes I5187d17c,I49a76582
* changes:
ConnectivityService: regroup bool <-> int conversions
ConnectivityService: move reportNetworkConnectivity to handler
Dianne Hackborn [Sat, 22 Apr 2017 00:33:43 +0000 (00:33 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev
Hugo Benichi [Sat, 22 Apr 2017 00:31:27 +0000 (00:31 +0000)]
Merge "NsdManager: add unit tests"
Stanley Tng [Sat, 22 Apr 2017 00:30:15 +0000 (00:30 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev am:
afe32d2fb1
am:
96ce732cba
Change-Id: Icdc667537d1b139bc63f2bf1da763a10695da04a
Android Build Merger (Role) [Sat, 22 Apr 2017 00:26:41 +0000 (00:26 +0000)]
Merge "Merge "Remove default public ctor from RttModifyStatus" am:
d065cf049e am:
cb93ac533d am:
f2a3b8af49" into oc-dev-plus-aosp
Hall Liu [Sat, 22 Apr 2017 00:25:54 +0000 (00:25 +0000)]
Merge "Remove default public ctor from RttModifyStatus" am:
d065cf049e am:
cb93ac533d
am:
f2a3b8af49
Change-Id: I0406a73c03969d38feb283e638dd2e36496b4141
Stanley Tng [Sat, 22 Apr 2017 00:23:59 +0000 (00:23 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev
am:
afe32d2fb1
Change-Id: Id2111268de8fb0195e47e35909a3edfffa81e337
Hall Liu [Sat, 22 Apr 2017 00:19:47 +0000 (00:19 +0000)]
Merge "Remove default public ctor from RttModifyStatus" am:
d065cf049e
am:
cb93ac533d
Change-Id: I3e34e7bbebf2e4bfd12c0562d32037ece5c43ff6
TreeHugger Robot [Sat, 22 Apr 2017 00:17:24 +0000 (00:17 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev
Hall Liu [Sat, 22 Apr 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
am:
d065cf049e
Change-Id: Ie4afbc705810b3f370fb8e8d57be9053c6135083
TreeHugger Robot [Sat, 22 Apr 2017 00:14:06 +0000 (00:14 +0000)]
Merge "Update fullscreen user switcher on the lock screen."
Bill Yi [Sat, 22 Apr 2017 00:02:18 +0000 (00:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
63d52ca6bc -s ours
am:
63ce39cfe6 -s ours
Change-Id: I3c36011aff2035d32193ab7c3b73e4036af9280b
Treehugger Robot [Sat, 22 Apr 2017 00:01:50 +0000 (00:01 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
Jakub Pawlowski [Fri, 21 Apr 2017 23:57:45 +0000 (23:57 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev am:
08c90805b4
am:
263219560c
Change-Id: I0d6a86c027f49d57162d8e6b40847f5bb4696926
Bill Yi [Fri, 21 Apr 2017 23:56:10 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
63d52ca6bc -s ours
Change-Id: I9868606cd3aad069f740ec0e5d0498f30ffca306
Robert Greenwalt [Fri, 21 Apr 2017 23:50:37 +0000 (23:50 +0000)]
Merge "Mark Restricted APN connections as restricted." am:
b90b2015d3 am:
1778682242 am:
88a6acb9f6 -s ours
am:
40917c44b2 -s ours
Change-Id: Ieae70ca90bff3747ef66c6f15258fef28d061ce4
TreeHugger Robot [Fri, 21 Apr 2017 23:50:03 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
John Reck [Fri, 21 Apr 2017 23:48:38 +0000 (23:48 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev am:
aec1fbeaa3
am:
30baf2affa
Change-Id: I55e33f2d6b4e536d93daac57ff543c1f0d4780e9
Jakub Pawlowski [Fri, 21 Apr 2017 23:47:10 +0000 (23:47 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
am:
08c90805b4
Change-Id: I6a64de6594b0c54b0e12467780ea7bdc2dc29a91
Doris Liu [Fri, 21 Apr 2017 23:46:29 +0000 (23:46 +0000)]
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev am:
4d72cd9550
am:
ce680bfd06
Change-Id: I07401f285ae1abe18bf3932bf79618759f24c9bd
Adam Lesinski [Fri, 21 Apr 2017 23:40:31 +0000 (23:40 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev am:
5be3647a9e
am:
091fe96343
Change-Id: Ib313379b085c4d3ee435b22bb844aeeef6ff74cf
TreeHugger Robot [Fri, 21 Apr 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
Charles He [Fri, 21 Apr 2017 23:37:11 +0000 (23:37 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev am:
faf37babb0
am:
04ccde83ff -s ours
Change-Id: I8afa46a395b00482de07b81362acc76fd827edf8
Robert Greenwalt [Fri, 21 Apr 2017 23:36:13 +0000 (23:36 +0000)]
Merge "Mark Restricted APN connections as restricted." am:
b90b2015d3 am:
1778682242
am:
88a6acb9f6 -s ours
Change-Id: I7a0019557721593761ae605db8e28bf4e15c06b0
John Reck [Fri, 21 Apr 2017 23:32:39 +0000 (23:32 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
am:
aec1fbeaa3
Change-Id: I593f46bad6a3214d7a21f3581ea43c78843949ef
Robert Greenwalt [Fri, 21 Apr 2017 23:29:47 +0000 (23:29 +0000)]
Merge "Mark Restricted APN connections as restricted." am:
b90b2015d3
am:
1778682242
Change-Id: I2300c5e98b8e3339825bfac7ea1f6d514b5ae71f
TreeHugger Robot [Fri, 21 Apr 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
Robert Greenwalt [Fri, 21 Apr 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Mark Restricted APN connections as restricted."
am:
b90b2015d3
Change-Id: Icd54c671035da752663d9ec125f999298aa1d8e7
Doris Liu [Fri, 21 Apr 2017 23:23:09 +0000 (23:23 +0000)]
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
am:
4d72cd9550
Change-Id: I37f564cb4b55572dae2a6cf93e2ba4528ddf8a93
Doris Liu [Fri, 21 Apr 2017 23:14:28 +0000 (23:14 +0000)]
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
Treehugger Robot [Fri, 21 Apr 2017 23:12:51 +0000 (23:12 +0000)]
Merge "Mark Restricted APN connections as restricted."
Adam Lesinski [Fri, 21 Apr 2017 22:42:31 +0000 (22:42 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
am:
5be3647a9e
Change-Id: Ie0408d44a2641e704c18399c996aff7f996e2764
Stefan Ramsauer [Fri, 21 Apr 2017 22:37:30 +0000 (22:37 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier."
TreeHugger Robot [Fri, 21 Apr 2017 22:35:49 +0000 (22:35 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
Charles He [Fri, 21 Apr 2017 22:34:42 +0000 (22:34 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev
am:
faf37babb0
Change-Id: I0af254a0e04c093df8aff56489954f2c60f3b305
TreeHugger Robot [Fri, 21 Apr 2017 22:29:32 +0000 (22:29 +0000)]
Merge "Fix bug with translation in ExpandableNotificationRow."
TreeHugger Robot [Fri, 21 Apr 2017 22:27:43 +0000 (22:27 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev
Robin Lee [Fri, 21 Apr 2017 22:24:31 +0000 (22:24 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am:
e4f56a7e44 am:
cd8557d15a am:
4de3794c26
am:
5d30d86372
Change-Id: If94864a6320af8ae69777abca0483ce62ff2ebc9
Rakesh Iyer [Wed, 19 Apr 2017 18:28:26 +0000 (11:28 -0700)]
Update fullscreen user switcher on the lock screen.
The older implementation didn't scale well with an
increasing number of users, it just kept making the
user pods smaller and smaller. Replace the custom
GridView with a custom ViewPager with a paging
indicator.
Also remove all the text from the screen since we
don't need it anymore.
More changes to follow.
Bug:
36454400
Test: Created more users than can fit on one screen,
booted up and switched between the users.
Change-Id: I6de323fbaa6bc4cefc2bdb73a4c68c4f092a08a6
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit
ad4d1d8e28618546953e75d4983335631feb6f2a)
Anthony Chen [Fri, 21 Apr 2017 22:18:33 +0000 (22:18 +0000)]
Merge "Allow clipping of notifications to be toggled."
Robin Lee [Fri, 21 Apr 2017 22:17:15 +0000 (22:17 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am:
e4f56a7e44 am:
cd8557d15a
am:
4de3794c26
Change-Id: Ic1e96eac68ddc8a713b3c71b5c126cb8b99c59f5
Robin Lee [Fri, 21 Apr 2017 22:11:05 +0000 (22:11 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am:
e4f56a7e44
am:
cd8557d15a
Change-Id: I4e0aa1a88c259b77d7a9ac9e1dd02566e415005d
Robin Lee [Fri, 21 Apr 2017 22:05:33 +0000 (22:05 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
am:
e4f56a7e44
Change-Id: I80b3607fd1c61875be8354439e09db56a0bd391d
Dianne Hackborn [Fri, 21 Apr 2017 21:17:23 +0000 (14:17 -0700)]
Address various JobScheduler API feedback.
- New sample code.
- Fix/improve some docs.
- Hide JobWorkItem Parcl constructor.
Also:
- Add new JobWorkItem API to get the number of times it has been
delivered.
- Do a bit more optimization of checking if a job is ready.
Bug:
37534393 API Review: JobInfo.Builder
Bug:
37544057 API Review: JobServiceEngine
Bug:
37544153 API Review: JobWorkItem
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I66891a038fba752f45dcaed43e615fa9209b71fc
Robert Greenwalt [Mon, 10 Apr 2017 21:32:23 +0000 (14:32 -0700)]
Mark Restricted APN connections as restricted.
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug:
37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac
Seigo Nonaka [Fri, 21 Apr 2017 21:58:39 +0000 (21:58 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev am:
31eeb08bdb
am:
e7c2e03d22
Change-Id: I276206b9bff862e8147339e77e77faeb1a938f97
Hassan Shojania [Fri, 21 Apr 2017 21:55:05 +0000 (21:55 +0000)]
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev am:
a72902a079
am:
abf54a61bc
Change-Id: I1b5e5717811398e6f2b7b2c1edd6008cdf75754d
Treehugger Robot [Fri, 21 Apr 2017 21:53:14 +0000 (21:53 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
Chen Xu [Fri, 21 Apr 2017 21:51:08 +0000 (21:51 +0000)]
Merge "telephony service support notification channel" into oc-dev am:
53d9e9d094
am:
102f3248b8
Change-Id: I95932e7312ec7f4eb023ff4503bbf27a2c6e86de
Suprabh Shukla [Fri, 21 Apr 2017 21:45:24 +0000 (21:45 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev am:
f277ccbca6
am:
de8f784bb2
Change-Id: Icaa3dc557f4a63250f22d334f57978e682830ab4
Seigo Nonaka [Fri, 21 Apr 2017 21:44:24 +0000 (21:44 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev
am:
31eeb08bdb
Change-Id: If757a42d277a4a313eafe08196610eb1cebc2bf5
Hassan Shojania [Fri, 21 Apr 2017 21:42:07 +0000 (21:42 +0000)]
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
am:
a72902a079
Change-Id: I6825cfec699dbe1135ee12df0ce81052d7e57304
Makoto Onuki [Fri, 21 Apr 2017 21:40:05 +0000 (21:40 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev am:
ba5c2d3e44
am:
21119c4e51
Change-Id: I80623f0f471b7c206da24fd7347dfb472a156ab8
Chen Xu [Fri, 21 Apr 2017 21:38:43 +0000 (21:38 +0000)]
Merge "telephony service support notification channel" into oc-dev
am:
53d9e9d094
Change-Id: I51432b33bce1cd957d2c1a139513d913a3b2c178
Hall Liu [Fri, 21 Apr 2017 21:33:12 +0000 (14:33 -0700)]
Remove default public ctor from RttModifyStatus
Test: builds
Bug:
37515063
Change-Id: I1e573d945b48e28d12621078cc8f37eb076d9ee3
Suprabh Shukla [Fri, 21 Apr 2017 21:31:45 +0000 (21:31 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
am:
f277ccbca6
Change-Id: I836447e93964519f930e0ab1f9c08cdab406e2d6
TreeHugger Robot [Fri, 21 Apr 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev
Makoto Onuki [Fri, 21 Apr 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev
am:
ba5c2d3e44
Change-Id: Ibf74cfc80511d6167c134d7e86e8e59921dc90c7
Hassan Shojania [Fri, 21 Apr 2017 21:28:34 +0000 (21:28 +0000)]
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
Chen Xu [Fri, 21 Apr 2017 21:26:26 +0000 (21:26 +0000)]
Merge "telephony service support notification channel" into oc-dev
Wei Jia [Fri, 21 Apr 2017 21:25:04 +0000 (21:25 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev am:
62a3aa745a
am:
f38aa207b2
Change-Id: Ib2c0db36dd3f9958f0ecb714a1b6e73d73e3455d
TreeHugger Robot [Fri, 21 Apr 2017 21:22:05 +0000 (21:22 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:20:24 +0000 (21:20 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev
Wei Jia [Fri, 21 Apr 2017 21:19:36 +0000 (21:19 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
am:
62a3aa745a
Change-Id: I09feef76ad0ea67eaebecb6a14494b4fcb33e1e8
Seigo Nonaka [Fri, 21 Apr 2017 17:16:26 +0000 (10:16 -0700)]
Introduce TextView attribute for control justification.
Bug:
37447278
Test: am instrument -w -e class android.widget.cts.TextViewTest
android.widget.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7946f460ad8a6c2423b464c27225411d155d4d8d
Doris Liu [Fri, 21 Apr 2017 19:24:54 +0000 (12:24 -0700)]
Behavior compat for child being manipulated outside Animatorset
When a child animator is being manipulated outside of the AnimatorSet,
such as when the child animator is running before the AnimatorSet gets
started, we need to make sure we maintain the behavoir on N:
The child animator will be re-started at its scheduled start time in
the AnimatorSet.
BUG:
37507882
Test: Repro steps in comment #1 & ag/
2144081/
Change-Id: Ib97e85706f01d18a2e72fb4d1d678e22cf959894
TreeHugger Robot [Fri, 21 Apr 2017 21:10:47 +0000 (21:10 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
Eric Laurent [Fri, 21 Apr 2017 21:00:03 +0000 (21:00 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev am:
910311b356
am:
e8d82e5d2d
Change-Id: I927e5e64bf605c2cd5f4ac03d0c3dfc02dfdbcc8
Jakub Pawlowski [Fri, 21 Apr 2017 20:56:22 +0000 (20:56 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf am:
e00b92e550 am:
b4be7093da
am:
c611b7ae90
Change-Id: I5b4523adc324a49f78d4f5a9309fc01dfcd14d04
Eric Laurent [Fri, 21 Apr 2017 20:52:49 +0000 (20:52 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
am:
910311b356
Change-Id: I13cbf5a51eaa884527f4df79fe215e4b012082e0
Anthony Chen [Fri, 21 Apr 2017 20:51:32 +0000 (13:51 -0700)]
Fix bug with translation in ExpandableNotificationRow.
The translation X should only be used if the entire Notification row is
translating (meaning that mShouldTranslateContents is false).
Test: booted up on AAE headunit and Angler device
Change-Id: I5d04f2bd64cb79421ad30f844ba5e6aa8d1f105d
Jakub Pawlowski [Fri, 21 Apr 2017 20:50:07 +0000 (20:50 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf am:
e00b92e550
am:
b4be7093da
Change-Id: I712347c5e3ceaae00fd179e77d62311ef6bba89d
John Reck [Fri, 21 Apr 2017 17:50:59 +0000 (10:50 -0700)]
Fix @throws javadoc on SurfaceTexture ctors
Change-Id: I63bd76ec4e44251b7e06ad6fc8aa5a3372104656
Fixes:
37323694
Test: Looked at generated docs, verified correct
Matthew Ng [Fri, 21 Apr 2017 20:47:19 +0000 (20:47 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev am:
e00febf61c
am:
90734c3d7d
Change-Id: I831832fd22168ff443dca0b49f74e687107478ec
Jakub Pawlowski [Fri, 21 Apr 2017 20:43:55 +0000 (20:43 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf
am:
e00b92e550
Change-Id: I6805a973e91ac16cfc5d1c30567df04e7ed98ba2
TreeHugger Robot [Fri, 21 Apr 2017 20:43:45 +0000 (20:43 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 20:42:21 +0000 (20:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
(cherry picked from commit
4634b5cd27b274105e550f58f9d5fc51c79eb3fb)
Matthew Ng [Fri, 21 Apr 2017 20:39:21 +0000 (20:39 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
am:
e00febf61c
Change-Id: Icb24d1e3e2845544936268fbbb5d27b48681506d
Jakub Pawlowski [Fri, 21 Apr 2017 20:38:00 +0000 (20:38 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
am:
c8d5f84fcf
Change-Id: Ieec563c19e318e6ffc0716009d554a11ff9f4847
Jeff Sharkey [Fri, 21 Apr 2017 20:35:24 +0000 (20:35 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev am:
0a02259bba
am:
8203c3694a
Change-Id: I4bb0d19647db20e91d06602322fab6914a891d8e
TreeHugger Robot [Fri, 21 Apr 2017 20:30:46 +0000 (20:30 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
Jakub Pawlowski [Fri, 21 Apr 2017 20:28:44 +0000 (20:28 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
Jeff Sharkey [Fri, 21 Apr 2017 20:26:59 +0000 (20:26 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
am:
0a02259bba
Change-Id: I10256e0e19e07f0636561a202cd5a5f38a59047f
OSDN Git Service
