Commit Graph

64628 Commits

Author SHA1 Message Date
tom hsu
969a6a613c Fix failures on com.android.settings.network.ApnEditorTest
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: Ib718a4ed0163e07be748857a0dc7b2af92036c3f
2020-04-17 03:45:40 +08:00
TreeHugger Robot
5756db17a5 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02 am: 90dbc28e57
Change-Id: I2c5ba52b4cd72b5f7199d31fc7ebbd8b30797b1e
2020-04-16 16:54:55 +00:00
TreeHugger Robot
8fa5dd8f8d Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f6de85b27 am: 91c31662d9
Change-Id: I3625922cc558e25b30e8008148c92994e2930115
2020-04-16 16:42:31 +00:00
TreeHugger Robot
5e159c017c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: bafc52f0f0
Change-Id: Ibc058dec0f9a09193b671cbf9ad2df27b9896681
2020-04-16 16:42:21 +00:00
TreeHugger Robot
90dbc28e57 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02
Change-Id: I6a9c98ab6eb996c678bd5c9e005959a5449dbfc6
2020-04-16 16:42:19 +00:00
TreeHugger Robot
91c31662d9 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f6de85b27
Change-Id: Ie097c989f8d2e9baf11825e4267b9503f8946f3a
2020-04-16 16:29:59 +00:00
TreeHugger Robot
58b434ad02 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c
Change-Id: I0b32dd33d9713759978b16effc55bbe2e197fff6
2020-04-16 16:29:56 +00:00
TreeHugger Robot
bafc52f0f0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c
Change-Id: I3c86265ed7e91afe94b7b36ec2252f998758ea2c
2020-04-16 16:29:43 +00:00
TreeHugger Robot
8f6de85b27 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I21981e1ceb800febebd1f4e5d819ea4831eb3896
2020-04-16 16:16:22 +00:00
TreeHugger Robot
8f39c1380c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I921ee0886440878a8ec0c231cb511019148be8f5
2020-04-16 16:16:16 +00:00
TreeHugger Robot
afbf9e60c0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev 2020-04-16 16:01:43 +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
Sunny Shao
d63c5ebff5 Fix incorrect app count displayed under special app access
- This special app Google Play services will change its hasLauncherEntry
  value after receiving the MSG_LOAD_LAUNCHER.
- Update the summary while SpecialAppAccessPreferenceController is
  receiving the onLauncherInfoChanged callback.

Fixes: 150480524
Test: manual test
Change-Id: I26b99fce54606644ee5603b4ca4730267c0f7ce5
2020-04-16 21:38:03 +08: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
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
Tsung-Mao Fang
b3bb7a0237 Fallback to AOSP emergency info if the original intent is broken
If the variant of emergency info is broken, we should try to show
AOSP emergency info instead.

Test: Rebuilt rom and see the Ui. Run robo test
Fix: 154114259
Change-Id: I5bc3f6cbf9102a7b7299c3edf718a58101effbf8
2020-04-16 17:23:52 +08: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
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
Menghan Li
3b1cecd0c7 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 1d2d72a716
Change-Id: Ic2424209807443f1bc48631c3a11a573a7cf88a8
2020-04-16 06:53:06 +00:00
Menghan Li
26a36e81b0 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983
Change-Id: Ie699bf850c661445e5c773f34359826b21d7f855
2020-04-16 06:52:59 +00:00
tim peng
6ba577b3e0 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 93b092fff8
Change-Id: I79d6d0c213f05cb6ffa78f58c8a75044d5ac9cf5
2020-04-16 06:52:55 +00:00