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
Bill Yi
7af66a9285
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I4087070e45c39bc32c6f09d2a77ebaef2ac123a3
2020-04-16 02:05:37 -07:00
Bill Yi
927517c4ae
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I21cb8a86da2a0fc1dc33f0a2ed8e0e5a593d4165
2020-04-16 01:22:15 -07: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
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
tim peng
2bd8c71b27
Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e
...
Change-Id: Id359b3065edeb9aed8bf0c1f4f01b6f7c553c095
2020-04-16 06:52:52 +00:00
Menghan Li
fd510cc5ae
Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983
...
Change-Id: I3a6125afcaafd195fd9a3ce7baca64aff52db93e
2020-04-16 06:52:49 +00:00
tim peng
5c68b4a9a8
Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e
...
Change-Id: I24505a511d0932c2ea17baad7750c1701d247d5a
2020-04-16 06:52:38 +00:00
Menghan Li
1d2d72a716
Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26
...
Change-Id: Ib29cdca795c1b9432d0b377ed2fff2d269e2da3f
2020-04-16 06:37:26 +00:00
Menghan Li
4ee3e3b983
Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26
...
Change-Id: Ic53a132347c296c936bd498c543fab7afce51a2c
2020-04-16 06:37:21 +00:00
tim peng
93b092fff8
Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288
...
Change-Id: Ice66c6c264c880246dbeec4e072fa1f902294fcb
2020-04-16 06:37:19 +00:00
tim peng
4d97cc4e8e
Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288
...
Change-Id: Ia96f690a596633fab838eac2c5be99eec92508fc
2020-04-16 06:37:06 +00:00
Tom Hsu
132526487f
Merge "Fix failures on com.android.settings.network.ApnEditorTest"
2020-04-16 06:36:02 +00:00
Menghan Li
5970337d26
Merge "Refines animation for caption preferences tutorial" into rvc-dev
2020-04-16 06:25:03 +00:00
tim peng
ea3a83e288
Merge "Incorrect panel layout after rotation" into rvc-dev
2020-04-16 06:10:15 +00:00
Bill Yi
c911af6763
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic6695a1ecc2c9a11a8334b12878fe6370012b276
2020-04-15 22:34:47 -07:00
TreeHugger Robot
e64f19358a
Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 32fe4e1bd1 am: 4dbd613b0a am: 84b63203a5
...
Change-Id: I8251cc3571d527731b6260e254b5d62e42f45172
2020-04-16 00:27:11 +00:00
Calvin Pan
1d401fdf00
Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: b377a53f9c am: edcbde0ea7 am: 55d774cd2e
...
Change-Id: Ifb93ba6e03ee8ccd7ffed57ae037bcc083fa9ad1
2020-04-16 00:19:55 +00:00
TreeHugger Robot
f002348998
Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 89e3b29558 am: a433082399 am: ddc30eb216
...
Change-Id: Iae3a279dde90b37f38468cc0e31e4e378331e7c1
2020-04-16 00:19:02 +00:00
Automerger Merge Worker
0740c18493
Merge "Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4f1175397c" into rvc-d1-dev-plus-aosp am: 154b539a4a am: 4e9d606887
...
Change-Id: Id44f2adb2e5f9f0cff3da9f0f04b086c88858a65
2020-04-16 00:18:14 +00:00
TreeHugger Robot
f2753cc16d
Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 5e3b8cf66f am: b5793c1c89
...
Change-Id: I20b8f10ce745ef0d58a645fd562bd5e08cc3bad9
2020-04-16 00:17:43 +00:00
Calvin Pan
fc660172c2
Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: a64c7679a0 am: 8a9c8fc27e
...
Change-Id: I9ee7b2e4846d3d93482a20e553a16c9c3ad4ba5b
2020-04-16 00:12:41 +00:00
TreeHugger Robot
491cc4d0c0
Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: de064c6c54 am: f13bcd75aa
...
Change-Id: Ib481212ed4bc3613e5e14e27c6300ce954c10471
2020-04-16 00:11:02 +00:00
Automerger Merge Worker
eca4bd2081
Merge "Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: d5a33f2a95" into rvc-d1-dev-plus-aosp am: 1824dc93bc am: 54eb41b91d
...
Change-Id: I67828201ea37e328346d1658dc1a18de1e80f222
2020-04-16 00:09:19 +00:00
PETER LIANG
139812463d
Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: f64b990432 am: c67f05e89d
...
Change-Id: Id3956a30d774a1f1cc1e3ff575724b9cb913d8c9
2020-04-16 00:06:51 +00:00
Rubin Xu
9ef2ddc217
Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 9e1c6293d1 am: f85d0635de
...
Change-Id: I18706a13e573810223947a7a6422e43e985cb29a
2020-04-16 00:06:29 +00:00
Automerger Merge Worker
c42e8365d0
Merge "Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 0dc62b8817 am: af62d57cb9" into rvc-qpr-dev-plus-aosp am: cb015b257f
...
Change-Id: I51e9bfb4fd63f56a2de80716a676ff0cf4452d86
2020-04-16 00:03:49 +00:00
TreeHugger Robot
727a473fa4
Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 9ade4f4cb4 am: 79a1fa33a2 am: c7cd4f525f
...
Change-Id: I42899bb9666e9d17c8a95acb29719343fccb8d0f
2020-04-16 00:03:03 +00:00
TreeHugger Robot
778e869cbb
Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 am: 8a28fb2b7e am: 3563ef4a2a
...
Change-Id: Ia1c6abc2d0ac103b26b406605e80231c62f2421c
2020-04-15 23:59:28 +00:00
Calvin Pan
3db9d3443b
Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: 4c877e1495 am: d530ee73b7 am: ab05fd9153
...
Change-Id: Ia95f8e0a0a6ff232425de03b8537800f072324a1
2020-04-15 23:57:58 +00:00
TreeHugger Robot
90e65e682b
Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: a37e523e2c am: 798bc7abd9 am: 8b2b488aa3
...
Change-Id: If30bc806dffe497f3db8152dc6398d627b3def89
2020-04-15 23:57:16 +00:00
PETER LIANG
1bf15b52fb
Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: be6265865c am: 53bf408b10 am: 4ef910ce6c
...
Change-Id: I87157d34786e5ff5fe5d1442ddfb9ac284ffa931
2020-04-15 23:55:30 +00:00
Rubin Xu
ece83c3142
Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 715f9316da am: 2edcafc323 am: 5271685c19
...
Change-Id: I017ae5f940c9c4564a3da0ff88ac5500e58914e2
2020-04-15 23:54:05 +00:00
Eugene Susla
596662c52e
Implement auto revoke user whitelist intent handler
...
Bug: 153607914
Test: presubmit
Change-Id: I22288d0a963fd03e38841a9f66c342f6eb283149
2020-04-15 15:04:11 -07:00
