Commit Graph

66051 Commits

Author SHA1 Message Date
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
Tom Hsu
fb634cb812 Merge "Fix failures on com.android.settings.network.ApnEditorTest" am: 132526487f
Change-Id: I9d54bd036d92e8d23ac5caf0a9415eae3be7b81e
2020-04-16 06:47:11 +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
09dd141462 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 32fe4e1bd1 am: 4dbd613b0a am: 84b63203a5 am: e64f19358a
Change-Id: I6565612a64210e47b8e600201dd16cda4fe51b60
2020-04-16 00:42:01 +00:00
Calvin Pan
134123e265 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: b377a53f9c am: edcbde0ea7 am: 55d774cd2e am: 1d401fdf00
Change-Id: Iff46f35c525cad620208bafea740d85242bc790b
2020-04-16 00:38:47 +00:00
TreeHugger Robot
f586c0e08c Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 89e3b29558 am: a433082399 am: ddc30eb216 am: f002348998
Change-Id: I0009af193037475114c4eef28b26a54edb89b53e
2020-04-16 00:38:23 +00:00
Automerger Merge Worker
d19362069d 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 am: 0740c18493
Change-Id: I2350c60ca0429cabfd35bf7fe23a41bea6e5067f
2020-04-16 00:37:54 +00:00
TreeHugger Robot
6a96aa082b Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 5e3b8cf66f am: b5793c1c89 am: f2753cc16d
Change-Id: I5d4729e949eba85118c5461ecd1bca569f17e5ab
2020-04-16 00:37:44 +00:00
Calvin Pan
62d1b0801d Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: a64c7679a0 am: 8a9c8fc27e am: fc660172c2
Change-Id: I680fe2bb7a67d086c2c9fc9ae68e6b5d79bcca74
2020-04-16 00:31:20 +00:00
TreeHugger Robot
7a5e8a47ef Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: de064c6c54 am: f13bcd75aa am: 491cc4d0c0
Change-Id: I67fde578fb0acf29f78f317860d28dacd4730ddd
2020-04-16 00:30:51 +00:00
Automerger Merge Worker
0ac16ed1be Merge "Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: d5a33f2a95" into rvc-d1-dev-plus-aosp am: 1824dc93bc am: 54eb41b91d am: eca4bd2081
Change-Id: I7e8df9618fd3aa514fbfb68ba08797b1693b2983
2020-04-16 00:30:20 +00:00
PETER LIANG
2c442c2bff Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: f64b990432 am: c67f05e89d am: 139812463d
Change-Id: I55ddce5fa9cea0521bfc2b4859cca5c54ce53988
2020-04-16 00:30:01 +00:00
Rubin Xu
f53b3265bc Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 9e1c6293d1 am: f85d0635de am: 9ef2ddc217
Change-Id: I67fdc75b28810f0c6f6304c86bfafba088b77409
2020-04-16 00:29:16 +00: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
Automerger Merge Worker
247d318a9a 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 am: c42e8365d0
Change-Id: I68a63007d5c985b9c8236afd05a4c01304ce33e9
2020-04-16 00:27:02 +00:00
TreeHugger Robot
ba2ca6e5c0 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 9ade4f4cb4 am: 79a1fa33a2 am: c7cd4f525f am: 727a473fa4
Change-Id: I94ce751d4735083d86bfecdbd5eba72a715a18ed
2020-04-16 00:26:35 +00:00
TreeHugger Robot
83a199787e Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 am: 8a28fb2b7e am: 3563ef4a2a am: 778e869cbb
Change-Id: I36399f532cec8760bf80a146d9adeb7b998f68a7
2020-04-16 00:23:44 +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
Calvin Pan
2d86c56e1f Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: 4c877e1495 am: d530ee73b7 am: ab05fd9153 am: 3db9d3443b
Change-Id: I22e4f7949a7276527ed4cf866eee024ffc546797
2020-04-16 00:18:30 +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
TreeHugger Robot
0a2d935858 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: a37e523e2c am: 798bc7abd9 am: 8b2b488aa3 am: 90e65e682b
Change-Id: I30226c4c06cbfd91785576be0b980f3894ffd927
2020-04-16 00:09:39 +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
97e763d187 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: be6265865c am: 53bf408b10 am: 4ef910ce6c am: 1bf15b52fb
Change-Id: Ie850956d5b134f8a7ce31829a056e92bec21a6ec
2020-04-16 00:08:44 +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
Rubin Xu
0af1251884 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 715f9316da am: 2edcafc323 am: 5271685c19 am: ece83c3142
Change-Id: Ifc2631c95595de9b2fd58fe8a7081d80f46e2260
2020-04-16 00:06:10 +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
Julia Reynolds
e3cb4f094e Launch subscreens with the correct user
Test: atest
Fixes: 153556621
Change-Id: I5f3f0f408dc8e50db1762b1ce93f7748ea6332b0
2020-04-15 17:36:11 -04:00