Commit Graph

65671 Commits

Author SHA1 Message Date
Tom Hsu
b22f5daf13 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" 2020-04-16 15:05:40 +00:00
Julia Reynolds
83d71c1f8f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4 am: d399bf68ca
Change-Id: I5976b1870aa94a14bbcf38fd21041fe1a8b65e3e
2020-04-16 14:56:48 +00:00
TreeHugger Robot
d86bfc9abb [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours am: 674dc8c05c -s ours
am skip reason: subject contains skip directive

Change-Id: I316000e7890022a1ec64b7828faaddd49fe51c75
2020-04-16 14:56:17 +00:00
TreeHugger Robot
06407ffc75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours am: 1236118a6e -s ours
am skip reason: subject contains skip directive

Change-Id: I94d3d6fe492e9cdc8299e49b07bcca1e491d680a
2020-04-16 14:55:58 +00:00
Julia Reynolds
039fbbe558 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2 am: 235cdb1681
Change-Id: Iedf11fe0a0e34213f0944247052c6ee86088e17d
2020-04-16 14:55:04 +00:00
Julia Reynolds
dbef46a5d5 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6
Change-Id: I8384671d90c0bb08df14840ddd9813129da63bfd
2020-04-16 14:53:53 +00:00
Julia Reynolds
d399bf68ca Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4
Change-Id: Idbe504d740ffce1c54f4a255b6cad974fe52d64f
2020-04-16 14:50:09 +00:00
TreeHugger Robot
674dc8c05c [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours
am skip reason: subject contains skip directive

Change-Id: I66006b3f388e333d7809af9acd3a68ba1f74e3cc
2020-04-16 14:50:00 +00:00
TreeHugger Robot
1236118a6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied14a6c608b8d588bbb4abe839178eecead5cdde
2020-04-16 14:49:54 +00:00
Julia Reynolds
235cdb1681 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2
Change-Id: I10c0ddc94426795bbe7518cc3eb5168a1d7610d7
2020-04-16 14:44:00 +00:00
Julia Reynolds
fb328c7bc6 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9
Change-Id: I328786dafc9442534bda6c4118476610ede3fdfc
2020-04-16 14:42:45 +00:00
Julia Reynolds
5b949236c4 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e
Change-Id: I52a20c4411220162db138f6f9b5e8bdc0c07084e
2020-04-16 14:42:43 +00:00
TreeHugger Robot
307ee6b828 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:26 +00:00
TreeHugger Robot
15a22292f8 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:23 +00:00
Julia Reynolds
34c66fd94e Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8
Change-Id: I8ec8602c1e8753ce03d4c6acc75dcdf58be8c24e
2020-04-16 14:26:36 +00:00
Julia Reynolds
abf784e5a2 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f
Change-Id: I6a31ded37ad8365bf19a86eae4b709128f3fd944
2020-04-16 14:26:27 +00:00
Julia Reynolds
d2d8115ac9 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8
Change-Id: Iddf2bda7005bffe799b76f9a21d8937925fee693
2020-04-16 14:25:55 +00:00
Julia Reynolds
27d039315f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I739234dc3861dba8de2502424dbca9ee454c5b50
2020-04-16 14:12:43 +00:00
Julia Reynolds
f1801907d8 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I40f34bf9f15c76ad1474a8d6096d47027d37b13a
2020-04-16 14:12:27 +00:00
Julia Reynolds
0c99ecaec1 Merge "Launch subscreens with the correct user" into rvc-dev 2020-04-16 13:57:50 +00:00
Tom Hsu
b3bc413443 Revert "Fix failures on com.android.settings.network.ApnEditorTest"
This reverts commit 66a530ec97.

Reason for revert: <have useless code>

Change-Id: Ic3190e168e74f196ef29a3af4e41fbb2ae129d17
2020-04-16 13:08:16 +00:00
TreeHugger Robot
af8a4c4f02 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334 am: 1aaa1cad3f
Change-Id: Ib55594a26bd68469e3bd37ca6ff4c76f636866e9
2020-04-16 11:58:43 +00:00
TreeHugger Robot
6588e7d549 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 am: 579bdff443 am: 742e5af8f9
Change-Id: I47e600f05804318c7b72f3761272c7c304400751
2020-04-16 11:58:30 +00:00
TreeHugger Robot
1aaa1cad3f Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334
Change-Id: I307706f75aaf5fb6ae332b38b7faa0f96d2c2cf9
2020-04-16 11:58:00 +00:00
TreeHugger Robot
6313dd37e9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476 am: 3c290d9860
Change-Id: I27ec15f9f0e3c9a6902b1754177b4d93d6c6c655
2020-04-16 11:57:47 +00:00
TreeHugger Robot
742e5af8f9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 am: 579bdff443
Change-Id: I4a400c4dc12ff76e7454a464366fb602af88e12e
2020-04-16 11:47:36 +00:00
TreeHugger Robot
3c290d9860 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476
Change-Id: Ib12d4514907430e7987d3500a731dbbaad845252
2020-04-16 11:47:06 +00:00
TreeHugger Robot
c3143fb334 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0
Change-Id: I56704eb396e7cd5d0ba984cea17383713af0b4e1
2020-04-16 11:46:57 +00:00
TreeHugger Robot
579bdff443 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596
Change-Id: Id453df151f84942547c7ef96917264b1f198b26d
2020-04-16 11:32:00 +00:00
TreeHugger Robot
53d317a4d0 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35
Change-Id: I4d28d4e61aa47db8c4b6e172069605b283a50585
2020-04-16 11:31:59 +00:00
TreeHugger Robot
30fdfef476 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35
Change-Id: I392761026ae6e0bd76b5612a2794063c3591ef18
2020-04-16 11:31:47 +00:00
TreeHugger Robot
3ca1b39596 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
Change-Id: I483ba72fa1243efd2822b778b1621a431df200e3
2020-04-16 11:15:56 +00:00
TreeHugger Robot
8142527b35 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
Change-Id: Ibeb68b99a9c40bc61edc9706d596809d0c11e4f0
2020-04-16 11:15:44 +00:00
TreeHugger Robot
158bbe17f3 Merge "Support another new intent for mainline module intent" into rvc-dev 2020-04-16 11:03:19 +00:00
Tsung-Mao Fang
54150c9942 Support another new intent for mainline module intent
Mainline module team would like to create a new intent to support v2 UX.
In Settings side, if we found system supports this intent,
then we should navigate user to new place.

Test: Run robo test
Fix: 151189987
Change-Id: If4b437236b70c83a1f29a5c3d9e322178c8a6ec6
2020-04-16 17:35:38 +08:00
Menghan Li
9a74a4c691 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: 26a36e81b0 am: e60b873a58 am: 2f166a6a2d
Change-Id: I01c6ab88f7ba4a420336cd36530687bbfed6ff28
2020-04-16 07:27:48 +00:00
tim peng
a7db3fb84a Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 2bd8c71b27 am: 291866434b am: c43ef4957c
Change-Id: I4706b6e6751de64a62b2b08b63606a6daeb7b1c5
2020-04-16 07:27:08 +00:00
Menghan Li
45cc01283a Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 1d2d72a716 am: 3b1cecd0c7 am: 91e3f2bc74
Change-Id: I7306e299449bfbc80c65f26dbcd8e2b0fe6ea5ee
2020-04-16 07:26:28 +00:00
tim peng
a6b6c70ad9 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 93b092fff8 am: 6ba577b3e0 am: 3d46a3bfb1
Change-Id: I02244f6de765a3b88b1d06668253a3d63157c554
2020-04-16 07:25:06 +00:00
Menghan Li
1636606ca0 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: fd510cc5ae am: fdbaa16ece
Change-Id: I7d9d8e2fd588280bb31b65b2f8712d1e36337c10
2020-04-16 07:24:01 +00:00
Menghan Li
2f166a6a2d Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: 26a36e81b0 am: e60b873a58
Change-Id: Iefe79aeffa8a232aaaa72a90f50a445d235c8c80
2020-04-16 07:23:54 +00:00
tim peng
c43ef4957c Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 2bd8c71b27 am: 291866434b
Change-Id: Ifd75a094ba14b7cf22e39d661267a2f635e5faaa
2020-04-16 07:23:20 +00:00
tim peng
92275727ce Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 5c68b4a9a8 am: f693064f34
Change-Id: I00964ca1b5fc7e1dac0ad663d6776756749d08f8
2020-04-16 07:23:08 +00:00
Menghan Li
91e3f2bc74 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 1d2d72a716 am: 3b1cecd0c7
Change-Id: I837e6b5ea730355145fe8d173edac49fd381d146
2020-04-16 07:05:26 +00:00
Menghan Li
e60b873a58 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: 26a36e81b0
Change-Id: I59c99e105c023d56a6c201b1629c4777d28f7f12
2020-04-16 07:05:14 +00:00
tim peng
3d46a3bfb1 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 93b092fff8 am: 6ba577b3e0
Change-Id: If9ac67c4647ae2a6e072c7274b12cf14413af602
2020-04-16 07:05:05 +00:00
Menghan Li
fdbaa16ece Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: fd510cc5ae
Change-Id: I3ae47a028ee656bc87d7d718c74b369c87218b2f
2020-04-16 07:04:41 +00:00
tim peng
291866434b Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 2bd8c71b27
Change-Id: I4b2c72961585c9af9f4092ab8a8bd6fab468991a
2020-04-16 07:04:38 +00:00
tim peng
f693064f34 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 5c68b4a9a8
Change-Id: Iaf341f3fbd2cadc90c378e11ce15766a40304b83
2020-04-16 07:04:11 +00:00
Bill Yi
068172640a Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I3d4a999dcb0a53ea7b9d1b8dcdbff99972539d2c
2020-04-15 23:55:43 -07:00