Commit Graph

65603 Commits

Author SHA1 Message Date
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
TreeHugger Robot
53aee5bf1f Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 am: 62b01fdf6f am: 0f7b584db3 am: 67770f7f82
Change-Id: Ifac92c60787375863f20ab7453e720021d927cbc
2020-04-15 19:47:17 +00:00
TreeHugger Robot
84b63203a5 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 32fe4e1bd1 am: 4dbd613b0a
Change-Id: I3f7b6bedb723ae1c0eaef1f19268a62a7d417950
2020-04-15 19:17:24 +00:00
Calvin Pan
55d774cd2e Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: b377a53f9c am: edcbde0ea7
Change-Id: Ibd0b9c00c5e391400402cefcd4195830023ef9ef
2020-04-15 19:14:21 +00:00
TreeHugger Robot
ddc30eb216 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 89e3b29558 am: a433082399
Change-Id: Ic9ecc1c21ef2248bd89a2d6605dbb80e2777a058
2020-04-15 19:13:55 +00:00
Automerger Merge Worker
4e9d606887 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
Change-Id: I0b115e4c2ddbcd38b7134d117c0a2f1bc7b89730
2020-04-15 19:13:26 +00:00
TreeHugger Robot
b5793c1c89 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 5e3b8cf66f
Change-Id: Ic26a04870c0f6f6487ad8cd1f9a1028c5908e026
2020-04-15 19:13:13 +00:00
Calvin Pan
8a9c8fc27e Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: a64c7679a0
Change-Id: I45b81cd2132eda3b39fe3c65ac4f7b7c09df6eed
2020-04-15 19:10:36 +00:00
TreeHugger Robot
f13bcd75aa Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: de064c6c54
Change-Id: I3a2919b78819bb12c21284838aa804a336775cce
2020-04-15 19:02:26 +00:00
Automerger Merge Worker
54eb41b91d Merge "Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: d5a33f2a95" into rvc-d1-dev-plus-aosp am: 1824dc93bc
Change-Id: I85f476ffb3d246632d39d3da095516e107de7196
2020-04-15 19:00:41 +00:00
PETER LIANG
c67f05e89d Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: f64b990432
Change-Id: Icff0532bda3b8e789cb909a23e7e7da8891db187
2020-04-15 18:59:21 +00:00
Rubin Xu
f85d0635de Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 9e1c6293d1
Change-Id: Iff7cddd48d9d335cc4e32189960233e8082bcfff
2020-04-15 18:58:51 +00:00
Automerger Merge Worker
cb015b257f 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 2020-04-15 18:55:05 +00:00
TreeHugger Robot
6f3b2adbff Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 0dc62b8817 am: af62d57cb9
Change-Id: I2c9378f05e7c705f0f9349f2f6f3b3cedf6471b2
2020-04-15 18:54:59 +00:00
TreeHugger Robot
c7cd4f525f Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 9ade4f4cb4 am: 79a1fa33a2
Change-Id: Ia38eada9e880419c07b80809e8421940160dd633
2020-04-15 18:54:48 +00:00
TreeHugger Robot
3563ef4a2a Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 am: 8a28fb2b7e
Change-Id: Ib34987d6565888b59745c8326d0935117febb39d
2020-04-15 18:52:55 +00:00
Calvin Pan
ab05fd9153 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: 4c877e1495 am: d530ee73b7
Change-Id: I6600fa884bc381467b3318397ca8853abb103a48
2020-04-15 18:49:56 +00:00
TreeHugger Robot
8b2b488aa3 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: a37e523e2c am: 798bc7abd9
Change-Id: Id7b1c81f9964a17af8c003353569c397a514084e
2020-04-15 18:49:31 +00:00
PETER LIANG
4ef910ce6c Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: be6265865c am: 53bf408b10
Change-Id: Ie858091f026d9b7ee603f2613702f32a5caff2f0
2020-04-15 18:49:24 +00:00
Rubin Xu
5271685c19 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 715f9316da am: 2edcafc323
Change-Id: I5e335d87c5fde2423c6bfb3f3a0b8464fafb6def
2020-04-15 18:48:43 +00:00
TreeHugger Robot
67770f7f82 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 am: 62b01fdf6f am: 0f7b584db3
Change-Id: I6fc01ad7c4e9f7b481a1825a353e7ee54d16834b
2020-04-15 18:46:29 +00:00
TreeHugger Robot
79a1fa33a2 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 9ade4f4cb4
Change-Id: I399114c2baf7aa34ea33dc3a84d181ea26641391
2020-04-15 18:34:03 +00:00
Calvin Pan
d530ee73b7 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: 4c877e1495
Change-Id: I1de467bf76fc9491d926c509d8690852198febce
2020-04-15 18:19:49 +00:00
TreeHugger Robot
798bc7abd9 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: a37e523e2c
Change-Id: Idf8cede770c0ffd4af888e7dafe383c5d185f8a8
2020-04-15 18:18:58 +00:00
PETER LIANG
53bf408b10 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: be6265865c
Change-Id: Icc5ca67e34dfb321ddca91c507736ad57efd6a2b
2020-04-15 18:18:18 +00:00
Rubin Xu
2edcafc323 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 715f9316da
Change-Id: I4e8633ddb9fb2dd65280f1ddd377942910ee4876
2020-04-15 18:18:03 +00:00
TreeHugger Robot
0f7b584db3 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 am: 62b01fdf6f
Change-Id: Ie90c3bbf3288f1a6282dd48377e134ece912f41e
2020-04-15 18:16:31 +00:00
TreeHugger Robot
4dbd613b0a Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 32fe4e1bd1
Change-Id: Ic14992212b9b37e7532f9fdba542e5e6e8cfc3dd
2020-04-15 18:15:03 +00:00
TreeHugger Robot
9ade4f4cb4 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab
Change-Id: Ia93b4fa2b891a50ea8b59941fa5eefe4f0da0164
2020-04-15 18:12:01 +00:00
TreeHugger Robot
a2be65f64d Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 36b3b9a035 am: e192807da3 am: ae32869f21
Change-Id: I3ce1a035bd445273aab0bb733d0f96af4cc3d84f
2020-04-15 18:10:05 +00:00
TreeHugger Robot
282ad04497 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8 am: 046076a9b3 am: 333285315f am: 0d9974fbdb
Change-Id: I60eb63a09d819522cd447c7f7d1335cd0000f2fc
2020-04-15 18:05:18 +00:00
TreeHugger Robot
ee1e6b196f Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f am: b8d16ee675 am: bbcb1f910e am: 2352636e78
Change-Id: Ie75a6c832bf9559f25713ad8b333d49e4408814b
2020-04-15 18:04:48 +00:00
Vince Leung
11c5fa4f3c [automerger skipped] Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566 am: 6899a1ad06 am: a20accec2e -s ours am: 493f5bea32 -s ours
am skip reason: Change-Id I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b with SHA-1 7d6c329746 is in history

Change-Id: Ifa107be8e36221f5ae757fc508989006a188310c
2020-04-15 18:03:56 +00:00
TreeHugger Robot
719445f809 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 63536f8392 am: 631d0d054f am: 1f65b13cf4
Change-Id: Id145554f3cf6c03d7e6f47b9e38791fb874d31cb
2020-04-15 18:03:13 +00:00