Dianne Hackborn
fe51103711
Merge "Tweak ActivityManager.getPackageImportance()"
2016-10-25 22:41:00 +00:00
Adrian Roos
c8083b56cf
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2 -s ours am: 299b57410d -s ours am: 0d280c5a52 -s ours
...
am: 65bee562c0 -s ours
Change-Id: I58d0facdffd4b7da61d564bab4f5f2c2a214401d
2016-10-25 22:25:06 +00:00
Adrian Roos
cc425c1015
Ambient: If user turned off ambient, keep it off after split am: 21984eeaf7 -s ours am: 4e2bad2a02 -s ours am: cd9c84aff5 -s ours
...
am: f3ea02119b -s ours
Change-Id: If359f6999825093e1f406709596500a68bdabd92
2016-10-25 22:23:57 +00:00
Adrian Roos
65bee562c0
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2 -s ours am: 299b57410d -s ours
...
am: 0d280c5a52 -s ours
Change-Id: I6198082bc0dce2cccb7818e08e027e1df493ae1b
2016-10-25 22:17:05 +00:00
Adrian Roos
f3ea02119b
Ambient: If user turned off ambient, keep it off after split am: 21984eeaf7 -s ours am: 4e2bad2a02 -s ours
...
am: cd9c84aff5 -s ours
Change-Id: I7d4316b8cccf4a2cc5106778d2e20ab5d80a8577
2016-10-25 22:15:56 +00:00
Adrian Roos
0d280c5a52
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2 -s ours
...
am: 299b57410d -s ours
Change-Id: Id3b951d73e784b6bb7300d62df7df7957448f185
2016-10-25 22:11:37 +00:00
Adrian Roos
cd9c84aff5
Ambient: If user turned off ambient, keep it off after split am: 21984eeaf7 -s ours
...
am: 4e2bad2a02 -s ours
Change-Id: I578cbe489e705b77689860eb0cea7d79ab6cc4c8
2016-10-25 22:10:46 +00:00
Jakub Pawlowski
bd7c33967c
Merge "Add helper method to convert Bluetooth UUID to bytes" am: 8a0a58b218 am: f169ecb76f am: f68a0c6dec
...
am: 94aaa0a705
Change-Id: I6cbff5dba97d53763861b60c015cf6ff349eaa23
2016-10-25 22:02:54 +00:00
Adrian Roos
299b57410d
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
...
am: db1fd054d2 -s ours
Change-Id: I9f3d116efa02bfca1df96414110722afe143a6dc
2016-10-25 22:02:49 +00:00
Adrian Roos
4e2bad2a02
Ambient: If user turned off ambient, keep it off after split
...
am: 21984eeaf7 -s ours
Change-Id: Ia9508033be03059a382abfaaa2adfc3e415df81b
2016-10-25 22:02:44 +00:00
TreeHugger Robot
f2ec2c1e42
Merge "Apply display override config for secondary displays"
2016-10-25 22:00:57 +00:00
Jakub Pawlowski
94aaa0a705
Merge "Add helper method to convert Bluetooth UUID to bytes" am: 8a0a58b218 am: f169ecb76f
...
am: f68a0c6dec
Change-Id: I7d73817cbb42f52f89112416cf7e090f08bec4df
2016-10-25 21:58:48 +00:00
Adrian Roos
db1fd054d2
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
2016-10-25 21:55:52 +00:00
Jakub Pawlowski
f68a0c6dec
Merge "Add helper method to convert Bluetooth UUID to bytes" am: 8a0a58b218
...
am: f169ecb76f
Change-Id: I035eb25c9a320b1760221bc5928919a148801488
2016-10-25 21:54:44 +00:00
Jakub Pawlowski
f169ecb76f
Merge "Add helper method to convert Bluetooth UUID to bytes"
...
am: 8a0a58b218
Change-Id: I829135e559a9c3cf3c942258a16acee62c37c3ac
2016-10-25 21:47:35 +00:00
Adrian Roos
a702094fd1
Ambient: If user turned off ambient, keep it off after split am: cb60c7a87e am: b97cd830e0
...
am: fad599e875 -s ours
Change-Id: I69632f432c0fa16d62f63351cbad3fe940068925
2016-10-25 21:43:53 +00:00
Adrian Roos
fad599e875
Ambient: If user turned off ambient, keep it off after split am: cb60c7a87e
...
am: b97cd830e0
Change-Id: Ie0ea2eca7a74922d712d5f5bdedd005853f7a44d
2016-10-25 21:39:18 +00:00
TreeHugger Robot
9582726746
Merge "Ambient: If user turned off ambient, keep it off after split"
2016-10-25 21:38:44 +00:00
Jakub Pawlowski
8a0a58b218
Merge "Add helper method to convert Bluetooth UUID to bytes"
2016-10-25 21:36:38 +00:00
Adrian Roos
b97cd830e0
Ambient: If user turned off ambient, keep it off after split
...
am: cb60c7a87e
Change-Id: I7da07f53de4748462f06a805921e7dcd28637820
2016-10-25 21:31:17 +00:00
TreeHugger Robot
942fde1415
Merge "Add the ability to postpone transitions."
2016-10-25 21:12:12 +00:00
Andrii Kulian
5406e7ade8
Apply display override config for secondary displays
...
Now display-specific settings, such as dimensions and orientation,
are stored in display override config. For default display it is
mirroring the global config. Each time when global config is updated,
override of the default display should be updated too and vice versa.
Test: Existing and manual tests still pass.
Change-Id: Ic6c2190092d328820f314a05bed43c875db18170
2016-10-25 13:22:10 -07:00
Adrian Roos
21984eeaf7
Ambient: If user turned off ambient, keep it off after split
...
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: Id80d62727952f63b363f87c19b5befbde8ab5c31
Merged-In: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Merged-In: I346a53b0dc9cdf578c238113f4f33056ba0f3aea
Fixes: 32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
2016-10-25 19:40:34 +00:00
Adrian Roos
69741a2eb8
Ambient: If user turned off ambient, keep it off after split
...
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Fixes: 32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
2016-10-25 12:39:14 -07:00
Adrian Roos
cb60c7a87e
Ambient: If user turned off ambient, keep it off after split
...
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: I346a53b0dc9cdf578c238113f4f33056ba0f3aea
Merged-In: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Fixes: 32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
2016-10-25 12:37:00 -07:00
TreeHugger Robot
d80812b882
Merge "Optimize Fragment operations so that minimal work is done."
2016-10-25 19:33:27 +00:00
Jakub Pawlowski
f67ee83a22
Add helper method to convert Bluetooth UUID to bytes
...
Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
2016-10-25 12:30:24 -07:00
Christopher Wiley
fbc27b1e9e
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c am: c29f2575f2 am: a7bb5ad809
...
am: 2ae41619ae
Change-Id: Iee7c8575ee22a494e2657e15e1aaae9b05a37045
2016-10-25 18:43:16 +00:00
Christopher Wiley
2ae41619ae
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c am: c29f2575f2
...
am: a7bb5ad809
Change-Id: I249e487a26a1fbc8fa748c518fcb332e28598437
2016-10-25 18:38:33 +00:00
Christopher Wiley
a7bb5ad809
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am: 836ffa6e1c
...
am: c29f2575f2
Change-Id: Ica704d0a64dde80ae0a9f1cef0250bfbdafcd49a
2016-10-25 18:31:02 +00:00
Christopher Wiley
c29f2575f2
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
...
am: 836ffa6e1c
Change-Id: I1dab386e3891c01a2917c32847d2aecdbfa10102
2016-10-25 18:23:02 +00:00
TreeHugger Robot
945e30f0f3
Merge "Fix background animator not resetting"
2016-10-25 18:22:45 +00:00
Treehugger Robot
836ffa6e1c
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
2016-10-25 18:12:42 +00:00
Matthew Bouyack
6054a30a7f
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev am: 4f14be3d40 am: 070955608c
...
am: 46ee88afa8
Change-Id: Ic18392f642e6bff4a91c5a1517341c12fe861ad4
2016-10-25 17:09:42 +00:00
Matthew Bouyack
96e3a222fa
Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction. am: 8dd88f649b am: 36d5474ef8
...
am: dfe7d0bd0e
Change-Id: Ied2c3314b61f24e7c7a8442adcfbf33a383e65ed
2016-10-25 17:08:39 +00:00
Matthew Bouyack
46ee88afa8
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev am: 4f14be3d40
...
am: 070955608c
Change-Id: I994154d6c986cc7afe70617d3c38779a7a9b94ac
2016-10-25 17:02:34 +00:00
Matthew Bouyack
dfe7d0bd0e
Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction. am: 8dd88f649b
...
am: 36d5474ef8
Change-Id: Iaca05f400b080d80a5fb1b9b2882d303a836b638
2016-10-25 17:01:32 +00:00
Matthew Bouyack
070955608c
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev
...
am: 4f14be3d40
Change-Id: I730a5872a29236e75b40ff270e279caf6b6da16f
2016-10-25 16:55:49 +00:00
Matthew Bouyack
36d5474ef8
Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction.
...
am: 8dd88f649b
Change-Id: Id510d1e5653ec167a4494a9ff14728fca446862c
2016-10-25 16:55:44 +00:00
Matthew Bouyack
4f14be3d40
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev
2016-10-25 16:48:20 +00:00
Jorim Jaggi
7156b650f0
Fix background animator not resetting
...
Test: Set wallpaper, make sure screen is not black.
Change-Id: I4031375e0892906a4e4085ce05664191a55bfb4e
Fixes: 32375010
2016-10-25 08:34:42 -07:00
Cheryl Potter
34a6b577ce
docs: change gpu debugger redirect b/31781348 am: afbf16f908 am: fb4f5497b7 am: 2e7c67f3cd am: 90d300a0b1 am: 4fdbfbf48d
...
am: b2576a6cce
Change-Id: Ia135d813bf5bf65b52f144d25815715c0c52a48e
2016-10-25 15:29:30 +00:00
Cheryl Potter
b2576a6cce
docs: change gpu debugger redirect b/31781348 am: afbf16f908 am: fb4f5497b7 am: 2e7c67f3cd am: 90d300a0b1
...
am: 4fdbfbf48d
Change-Id: Icd72fc57ab7a2c21509065213c8b292e2c29ed8a
2016-10-25 15:24:55 +00:00
Cheryl Potter
4fdbfbf48d
docs: change gpu debugger redirect b/31781348 am: afbf16f908 am: fb4f5497b7 am: 2e7c67f3cd
...
am: 90d300a0b1
Change-Id: Ibcf179723383ad683ad6865a784d1d671fe35015
2016-10-25 15:17:55 +00:00
Cheryl Potter
90d300a0b1
docs: change gpu debugger redirect b/31781348 am: afbf16f908 am: fb4f5497b7
...
am: 2e7c67f3cd
Change-Id: I489007830f525fa1deaabe6cc78f6b0d41e78a77
2016-10-25 15:14:15 +00:00
Cheryl Potter
2e7c67f3cd
docs: change gpu debugger redirect b/31781348 am: afbf16f908
...
am: fb4f5497b7
Change-Id: I1c550fa22586145ec949fe54ef727be814624340
2016-10-25 15:10:22 +00:00
Cheryl Potter
fb4f5497b7
docs: change gpu debugger redirect b/31781348
...
am: afbf16f908
Change-Id: I6fa42074ba2fe6019f0bf817a7b21650d2a0dd43
2016-10-25 15:03:23 +00:00
Andrew Scull
22851dbcb2
Merge "Refactor password metric computation."
2016-10-25 09:04:58 +00:00
Bill Yi
a10e24d3cb
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bf2eaa1029 -s ours am: 2be91e7aff -s ours am: 595fc656e9 -s ours
...
am: 1b2742a678 -s ours
Change-Id: I446ad5206055709f05ee30f9609e9de35a2e9c8f
2016-10-25 06:57:02 +00:00
Bill Yi
96b8b1a7d3
Import translations. DO NOT MERGE am: 9ac3087a90 -s ours am: d091556b6c -s ours am: a97ce6c84e -s ours
...
am: bef31722eb -s ours
Change-Id: I56b97009d5ad7abc916676c0646662070f71fdc6
2016-10-25 06:56:15 +00:00