Automerger Merge Worker
12d3bc0dd7
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e am: 18ae0b78a2
...
Change-Id: I306ff6175b26d7a18c6888b92292198378a9b675
2020-03-16 14:13:12 +00:00
Automerger Merge Worker
e0404845b8
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e am: 875cb73df7
...
Change-Id: I6f6823259b72fa79f5aed85427ba6f7852114d4f
2020-03-16 14:13:03 +00:00
Automerger Merge Worker
d55db3a65a
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: a692d719cb am: 1019cb702d
...
Change-Id: I2780f5d544ee8b61f3e39c11411be8c772844e92
2020-03-16 14:12:55 +00:00
Automerger Merge Worker
e4197c4a5d
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: b32674e24f am: 5a0f0de777
...
Change-Id: I439c2db76153a35421dc641ffdb4e14590932363
2020-03-16 14:12:36 +00:00
Automerger Merge Worker
9586c26f3d
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 1eedf27e67
...
Change-Id: I34e6eafa602db3a9f3a80439adaba116a7423501
2020-03-16 14:11:27 +00:00
Automerger Merge Worker
9e93eba585
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3 am: 5a67d16648
...
Change-Id: Ibe57b13885a10baeb3bc388c8d7e6a7b0c8071c1
2020-03-16 14:11:16 +00:00
Automerger Merge Worker
875cb73df7
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e
...
Change-Id: I75c4fd88132b994e36adbb776f7b8a57a7f34cb3
2020-03-16 13:57:03 +00:00
Automerger Merge Worker
18ae0b78a2
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: cdbca2b45e
...
Change-Id: I7a6621f5d52612be031382a990f3e1d2c13af5f1
2020-03-16 13:57:01 +00:00
Automerger Merge Worker
1019cb702d
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378 am: a692d719cb
...
Change-Id: I28b0ac25eaa256f09767ac47e488f32d67d7eacf
2020-03-16 13:56:51 +00:00
Automerger Merge Worker
5a0f0de777
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: b32674e24f
...
Change-Id: I2a5d5dddadef629572f3b10a64ca3d17dbb0e298
2020-03-16 13:56:31 +00:00
Automerger Merge Worker
5a67d16648
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3
...
Change-Id: I87a5cbc54cb9603157b1abf1b8a8d48551db25e5
2020-03-16 13:55:53 +00:00
Automerger Merge Worker
1eedf27e67
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c am: 2fe4235ae3
...
Change-Id: I006df7c1d8e4e2512e9934ec107c4e41f25f6d8b
2020-03-16 13:55:06 +00:00
Automerger Merge Worker
a692d719cb
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378
...
Change-Id: If953928e35be8b0a93b6438c32084238bd9b6859
2020-03-16 13:48:06 +00:00
Automerger Merge Worker
cdbca2b45e
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378
...
Change-Id: I3641366b12a396edc6dbafc50700f248bac002a8
2020-03-16 13:47:57 +00:00
TreeHugger Robot
b94605c378
Merge "Update strings for Screen Attention suggestion." into rvc-dev
2020-03-16 13:46:14 +00:00
Automerger Merge Worker
b32674e24f
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c
...
Change-Id: Ibd5b7c7dfc2435253f969ba9f497e7a9dc1924f9
2020-03-16 13:39:19 +00:00
Automerger Merge Worker
2fe4235ae3
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c
...
Change-Id: I03eb5de2959fd59643ebb39d155f91fd2fb02298
2020-03-16 13:39:08 +00:00
Julia Reynolds
68fad762ff
Update NLS/NAS warning text
...
Test: manual
Fixes: 145129456
Change-Id: Ie3e7ecb432445c596d888614ae71cff27873ac6b
2020-03-16 09:30:10 -04:00
tim peng
b669fff40c
Merge "Handle ransferring state in output switcher" into rvc-dev
2020-03-16 13:17:03 +00:00
Automerger Merge Worker
44919ec2e9
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 6bc38f14a5 am: 819edf41f3 am: 179e37b256
...
Change-Id: Ib5b357759b61676149655bab5438360534ef6e51
2020-03-16 12:52:16 +00:00
Automerger Merge Worker
6f82e17d67
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: c9e4a2934f am: 9a58bd18f4 am: 27ec2e7d39
...
Change-Id: I6f1d53433db53af00f72e70b7c6e2adcd2b98572
2020-03-16 12:52:03 +00:00
Automerger Merge Worker
179e37b256
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 6bc38f14a5 am: 819edf41f3
...
Change-Id: I55c5677701261f8d8f7690bad243005fd6f00d77
2020-03-16 12:51:59 +00:00
Automerger Merge Worker
876a6f5816
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 225007141d am: 8a20a19b82
...
Change-Id: I81cfd1e401042001cc5cdc39ee0e132f1e043fcf
2020-03-16 12:51:36 +00:00
Automerger Merge Worker
27ec2e7d39
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: c9e4a2934f am: 9a58bd18f4
...
Change-Id: I57f2ae1e17ce80ee7e7ba946d6cc198e493263a2
2020-03-16 12:46:26 +00:00
Automerger Merge Worker
8a20a19b82
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 225007141d
...
Change-Id: I9293687f148af2c27f5821792556e21f31fd6e50
2020-03-16 12:46:07 +00:00
Automerger Merge Worker
819edf41f3
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb am: 6bc38f14a5
...
Change-Id: Idb62e7a10f90fc566ca63972b2a5a727fd4ee75f
2020-03-16 12:46:04 +00:00
Automerger Merge Worker
6bc38f14a5
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb
...
Change-Id: I80306346be78398203ec7155ce2e148a6d46b0b2
2020-03-16 12:33:58 +00:00
Automerger Merge Worker
9a58bd18f4
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: c9e4a2934f
...
Change-Id: I01883cb97e83e2250ff82596a68cff7466c8f354
2020-03-16 12:33:54 +00:00
Automerger Merge Worker
225007141d
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2 am: 2ae7c371cb
...
Change-Id: I3b0dd3fb1aa1cfb4582948239b7d1a753dbe1e0b
2020-03-16 12:33:39 +00:00
Automerger Merge Worker
c9e4a2934f
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
...
Change-Id: I334933880d8a192e7d031cfa039c406a56a753c0
2020-03-16 12:21:28 +00:00
Automerger Merge Worker
2ae7c371cb
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
...
Change-Id: I0bdc9b69c620576e2575e628af5d60d02f2eb58a
2020-03-16 12:21:21 +00:00
TreeHugger Robot
6d6e0f45b2
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev
2020-03-16 12:05:02 +00:00
Automerger Merge Worker
6c7644c912
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 am: 5df8cf0603 am: 8f2624d0b0 am: 4e9a8788ce
...
Change-Id: I43cc17226e6f95eda835fa0561cd9ebd1b9a2a71
2020-03-16 10:31:01 +00:00
Automerger Merge Worker
4e9a8788ce
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 am: 5df8cf0603 am: 8f2624d0b0
...
Change-Id: I816787cbab2d086e5347ab6cfa083ae91aaf9c6a
2020-03-16 10:23:56 +00:00
Automerger Merge Worker
fdf221eac1
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 9c6921cfb7 am: d7614e928b am: d07d4ac0b8
...
Change-Id: I81b23d093713fcbcbffd918a2e70e1b4da50c1b6
2020-03-16 10:23:46 +00:00
Automerger Merge Worker
d62c3cd5c2
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 am: 8c051e397b am: bea9e2e1d2
...
Change-Id: I25fb389004c67d55ce789f090ccaae76ba001aa0
2020-03-16 10:23:39 +00:00
Automerger Merge Worker
d07d4ac0b8
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 9c6921cfb7 am: d7614e928b
...
Change-Id: Ie0c65be29cb6a84d2ea723ede2f58c708727420a
2020-03-16 10:12:37 +00:00
Automerger Merge Worker
bea9e2e1d2
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 am: 8c051e397b
...
Change-Id: Iaa04a91a09b7755867824707057ce101852184a6
2020-03-16 10:12:08 +00:00
Automerger Merge Worker
8f2624d0b0
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97 am: 5df8cf0603
...
Change-Id: Ie5031be25e77aef0c10b61abd295850845bccab0
2020-03-16 10:12:06 +00:00
Automerger Merge Worker
5df8cf0603
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97
...
Change-Id: I60323f6e1e665e9bf6e59c4118e9ea9e8e91480d
2020-03-16 10:00:32 +00:00
Automerger Merge Worker
d7614e928b
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 9c6921cfb7
...
Change-Id: I2ff3e9f463d2d95a8efa9ca864f1dec063731c9e
2020-03-16 10:00:31 +00:00
Automerger Merge Worker
8c051e397b
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08 am: 4c2d10ee97
...
Change-Id: If132aff3582f2c10a32d38e3f1bdf93f8de8fc35
2020-03-16 10:00:10 +00:00
Yi-Ling Chuang
f288a4ec53
Update strings for Screen Attention suggestion.
...
Bug: 144865404
Test: rebuild
Change-Id: Id5ab9a68a5f83c6fdc6451b96d8e7bfd831891d1
2020-03-16 17:54:39 +08:00
Automerger Merge Worker
9c6921cfb7
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08
...
Change-Id: I31a8f50caf0c783d659eb9fbbe49261bdd5590fe
2020-03-16 09:46:47 +00:00
Automerger Merge Worker
4c2d10ee97
[Settings] Fix MobileNetworkActivity test case am: 2fad549b08
...
Change-Id: I561fafa46f5970c033fca48d9d0d6071333c797b
2020-03-16 09:46:43 +00:00
Alex Johnston
8d430de5d5
Fix AppButtonPreferenceControllerTest
...
* isSystem was not being mocked.
* The tests where isSystem should return true
were not being tested properly.
Bug: 151569506
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ib4249bca8f3c0321d0b64b4dbd4c4e5fc29586e1
2020-03-16 09:37:10 +00:00
zoey chen
2fad549b08
[Settings] Fix MobileNetworkActivity test case
...
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkActivityTest
Bug: 144664534
Change-Id: Ifc63646f709b29c3a8947430bcec6a82fae02ea5
2020-03-16 14:51:16 +08:00
Automerger Merge Worker
da791f3392
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 am: a8d351d734 am: c71d33b5d8 am: 444af7aa56
...
Change-Id: Ib9730e0ead28be3395ccd6ad82d6ae6478a689eb
2020-03-16 06:06:32 +00:00
Automerger Merge Worker
444af7aa56
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: 4dfb70f145 am: a8d351d734 am: c71d33b5d8
...
Change-Id: I708364c6be2238167c123236410b6a7ccc9fcc9c
2020-03-16 06:02:53 +00:00
Automerger Merge Worker
a530c5bc78
Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79 am: fa49765db7 am: bcae257906 am: f651f175de
...
Change-Id: I7f2c448b5f0498e8ea9a4a4f8adab12d32dbca1f
2020-03-16 06:02:09 +00:00
