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
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
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
TreeHugger Robot
79135fd26f
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 am: 53aee5bf1f
...
Change-Id: Ic0c853deeee19c5c5a98818123da5c658e809b07
2020-04-15 19:52:25 +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
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
bfc10cce85
Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 36b3b9a035 am: e192807da3 am: ae32869f21 am: a2be65f64d
...
Change-Id: I2b2d1f55bc8acdffc9e3f3bf0c95e98b01f159c8
2020-04-15 18:47:07 +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
62f5d9eaeb
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 am: 282ad04497
...
Change-Id: I90d1aa57136c929a51fd969fed3d45589de1f752
2020-04-15 18:39:40 +00:00
TreeHugger Robot
ff5c453d89
Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f am: b8d16ee675 am: bbcb1f910e am: 2352636e78 am: ee1e6b196f
...
Change-Id: Ic96fbf517c5c1d7904a814ea7963023990bf8454
2020-04-15 18:39:08 +00:00
Vince Leung
dd59de31d0
[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: 11c5fa4f3c -s ours
...
am skip reason: Change-Id I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b with SHA-1 7d6c329746
2020-04-15 18:38:33 +00:00
