Commit Graph

64174 Commits

Author SHA1 Message Date
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
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
ae32869f21 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 36b3b9a035 am: e192807da3
Change-Id: I980d778beda73bb3921b202aed6c3fd1979679c6
2020-04-15 18:00:10 +00:00
TreeHugger Robot
0d9974fbdb Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8 am: 046076a9b3 am: 333285315f
Change-Id: I1ff42f0a0cf4bd12c7bce6709bb75ddd68045e57
2020-04-15 17:58:41 +00:00
TreeHugger Robot
2352636e78 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f am: b8d16ee675 am: bbcb1f910e
Change-Id: I3cb17be8502c84d718bc84be58571fefa926febb
2020-04-15 17:57:53 +00:00
Vince Leung
493f5bea32 [automerger skipped] Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566 am: 6899a1ad06 am: a20accec2e -s ours
am skip reason: Change-Id I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b with SHA-1 7d6c329746 is in history

Change-Id: Ibd15a35ad6fd41dd738a0103d3eb8c5873dbf827
2020-04-15 17:56:35 +00:00
Calvin Pan
4c877e1495 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d
Change-Id: I3ed59308b803bf841eb3ab049fac823ce33b93eb
2020-04-15 17:50:31 +00:00
TreeHugger Robot
a37e523e2c Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe
Change-Id: Ic3a3c5a32a73c389be426373ccbf75eef6111c41
2020-04-15 17:49:33 +00:00
PETER LIANG
be6265865c Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479
Change-Id: Ie75fd242bcde971bdc535e22a55215911adb606d
2020-04-15 17:49:14 +00:00
Rubin Xu
715f9316da Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5
Change-Id: I68c7fce04c0193093d94cf3dd9ede1b3bbd8b426
2020-04-15 17:48:39 +00:00
TreeHugger Robot
62b01fdf6f Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696
Change-Id: Iaa53ddb545b732bcb29c9cf5e5f93a3548b172f7
2020-04-15 17:46:50 +00:00
TreeHugger Robot
8a28fb2b7e Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696
Change-Id: Ifae44e30175e531432182b3301d4ca8964e213d7
2020-04-15 17:46:22 +00:00
TreeHugger Robot
e192807da3 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 36b3b9a035
Change-Id: I7611ec2c71b0b3496f8662ac11f414a1133bae8e
2020-04-15 17:43:02 +00:00
TreeHugger Robot
1f65b13cf4 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 63536f8392 am: 631d0d054f
Change-Id: I47505c0a3eda78bd385881ab03f405d7aa572c12
2020-04-15 17:32:30 +00:00
TreeHugger Robot
333285315f Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8 am: 046076a9b3
Change-Id: I2d8237dda79d1e3b5cb00b884e6476f0299cd8ae
2020-04-15 17:31:37 +00:00
TreeHugger Robot
d4ed704604 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8 am: 8910d9cae0
Change-Id: Ibefba1525c620486940913f771783e4e3eb5096a
2020-04-15 17:31:20 +00:00
TreeHugger Robot
631d0d054f Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 63536f8392
Change-Id: Ic69f049a6bade5c7fa2221369cc21c5da7ca8219
2020-04-15 17:31:04 +00:00
TreeHugger Robot
bbcb1f910e Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f am: b8d16ee675
Change-Id: Ib8f84359e6c88758c53d2b49d16f7187d547d63d
2020-04-15 17:30:19 +00:00
Vince Leung
a20accec2e Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566 am: 6899a1ad06
Change-Id: Id25d866d0471acdb71a2bfffef899ef48164c54d
2020-04-15 17:30:03 +00:00
TreeHugger Robot
8910d9cae0 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8
Change-Id: Ifce877e9902bc841c68030d795c496a94272dca4
2020-04-15 17:29:09 +00:00
TreeHugger Robot
7763d89c45 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f am: 7e00c8d28c
Change-Id: I1b5992e89c8b8e801d318129cc89c0dbdf122675
2020-04-15 17:28:55 +00:00
Calvin Pan
106c2d210d Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04
Change-Id: I32dd168ae94fa39923e373a0b25a8012998e2c45
2020-04-15 17:28:40 +00:00
Vince Leung
840b29583a Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566 am: ed5f54623d
Change-Id: Ife3e46001f8d9e6bcb6a084b7ffbdb79087e79c5
2020-04-15 17:28:23 +00:00
TreeHugger Robot
65353e9dfe Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf
Change-Id: I7c13a0f6adeda0689911848c799a551f27971b99
2020-04-15 17:28:17 +00:00
TreeHugger Robot
046076a9b3 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8
Change-Id: I3e8c35947dae16bae658f65829b8db66007b332f
2020-04-15 17:28:04 +00:00
PETER LIANG
4c7a690479 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75
Change-Id: I0f135b960440a997116e3cb6e79b2d5380cb7aad
2020-04-15 17:26:37 +00:00
Rubin Xu
b87ed9fac5 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81
Change-Id: I17cc8fb5d338336c091f6620cc015880efb0c83b
2020-04-15 17:25:43 +00:00
TreeHugger Robot
00fea22696 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd
Change-Id: I3f3840b14f62be6badf1d0bd816327fb267e005c
2020-04-15 17:23:15 +00:00
TreeHugger Robot
6c2c780fd8 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
Change-Id: Iff4980697cc6748777bf491f0d74e4aa7a1fde5b
2020-04-15 17:17:31 +00:00
TreeHugger Robot
7e00c8d28c Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f
Change-Id: If6f8b0f6e9391c5fad747655f9707420c3308372
2020-04-15 17:14:48 +00:00
TreeHugger Robot
36b3b9a035 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438
Change-Id: Iea4d243399d902cc785be33a976e7a481160be46
2020-04-15 17:14:33 +00:00
TreeHugger Robot
b8d16ee675 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f
Change-Id: I170e27938a003371360d3b8f64c72f317023f1d3
2020-04-15 17:02:52 +00:00
Vince Leung
6899a1ad06 Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566
Change-Id: Id36378b8448cc0fee4857186885616a0a886b2b2
2020-04-15 17:02:14 +00:00
TreeHugger Robot
63536f8392 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
Change-Id: I60fc8f0427b85a27599e29c3b5c62f66efe330c2
2020-04-15 17:01:22 +00:00
TreeHugger Robot
9625a5ed1f Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
Change-Id: I298c67ecb36a20b733387ffdd88e5353c4445fdf
2020-04-15 17:00:26 +00:00
Vince Leung
ed5f54623d Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566
Change-Id: I9c8c78981cdcac3fbee321c78392e8432fcba97a
2020-04-15 16:59:32 +00:00
Calvin Pan
0758056d04 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev 2020-04-15 14:32:18 +00:00
TreeHugger Robot
82282b48cf Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev 2020-04-15 13:30:33 +00:00
PETER LIANG
eb04ef4f75 Merge "Revising the function name related to user shortcut type." into rvc-dev 2020-04-15 12:49:07 +00:00
Rubin Xu
81d8664d81 Merge "Improve work profile unification flow" into rvc-dev 2020-04-15 11:18:00 +00:00
Peter_Liang
58cc3ea7f9 Revising the function name related to user shortcut type.
Should add 's' into the name.

Bug: 148989018
Test: manual test
Change-Id: I46aadb80f4f28dc1794fc3313563c79be149e847
2020-04-15 17:43:05 +08:00