Commit Graph

65767 Commits

Author SHA1 Message Date
Menghan Li
c6fc4ab93f Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: 26a36e81b0 am: e60b873a58 am: 2f166a6a2d am: 9a74a4c691
Change-Id: I4293f47cbec53baecde3e07c207ac3d44a75dce4
2020-04-16 08:10:10 +00:00
tim peng
0c6226e2e4 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 2bd8c71b27 am: 291866434b am: c43ef4957c am: a7db3fb84a
Change-Id: Ief22a02266bc65c917ceb451e2bef3a4d92c29c8
2020-04-16 08:09:53 +00:00
Menghan Li
2c479e9330 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 1d2d72a716 am: 3b1cecd0c7 am: 91e3f2bc74 am: 45cc01283a
Change-Id: Iffc329d1265c70b8c02ca759d086a11426724759
2020-04-16 08:09:28 +00:00
tim peng
229429af13 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 93b092fff8 am: 6ba577b3e0 am: 3d46a3bfb1 am: a6b6c70ad9
Change-Id: I10a7ee9cdcae9a1f9a92ce84b90921be35d70daf
2020-04-16 08:09:09 +00:00
Menghan Li
de7e2d868b Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: fd510cc5ae am: fdbaa16ece am: 1636606ca0
Change-Id: Ida1a6a080ef9f807d17d5c19260f47dfe9439a05
2020-04-16 08:08:50 +00:00
tim peng
8218679372 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 5c68b4a9a8 am: f693064f34 am: 92275727ce
Change-Id: Ice8d1a79628a011341a2fc8733d64eda310428d3
2020-04-16 08:08:34 +00: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
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
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
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