Commit Graph

61881 Commits

Author SHA1 Message Date
Automerger Merge Worker
abbead8a71 [automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours am: c799d3bc49 -s ours am: aeeb6405a1 -s ours
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1 is in history

Change-Id: Id999d490234eac52fac2670f88a2b1857d0a71cd
2020-03-08 05:52:53 +00:00
Automerger Merge Worker
aeeb6405a1 [automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours am: c799d3bc49 -s ours
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1 is in history

Change-Id: Ie0e9f3ee5f73f7db555a50a3cec2b9c6fcdbed70
2020-03-08 05:39:10 +00:00
Automerger Merge Worker
c799d3bc49 [automerger skipped] Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e am: 1ec7c14b3b -s ours
am skip reason: Change-Id I5fa42e48b8c073b4c4933b32417c2cbeada09a40 with SHA-1 8598dccce1 is in history

Change-Id: I8352d1b47e9d8bb71442d0f62bdf3717794d1089
2020-03-08 05:26:30 +00:00
Automerger Merge Worker
1ec7c14b3b Merge "PreferredNetworkModePreferenceController's summary no 5G item" am: a49021a71e
Change-Id: Ia3bdc608b679922f93398ba3c11a9f393374548a
2020-03-08 05:10:45 +00:00
Treehugger Robot
a49021a71e Merge "PreferredNetworkModePreferenceController's summary no 5G item" 2020-03-08 04:52:56 +00:00
Automerger Merge Worker
675f9e39b3 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440 am: c984dca0eb am: 4bfb3bd6a0
Change-Id: I4caebe9b9b41c7cf6c56279e9128a2ddae5a432a
2020-03-07 23:20:15 +00:00
Automerger Merge Worker
203c3a8d7e Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp am: 7f72b3d0b6 am: 48cf7ebb43
Change-Id: I4864460f92c3be42cb8230e739e3d69b4d0d9c02
2020-03-07 23:19:40 +00:00
Automerger Merge Worker
c4e1408a30 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36 am: dcbe174ab5
Change-Id: I3a449473066ae36f13cae1f36f9a2ace98836f83
2020-03-07 23:18:44 +00:00
Automerger Merge Worker
7e1c9610d4 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099 am: ed39063010 am: df15f18379
Change-Id: Iaefe6b5c6a175ee74e517592aebe7eac7d522885
2020-03-07 23:18:08 +00:00
Automerger Merge Worker
f01b173153 Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp am: 3e841653dc am: 1d975fa486
Change-Id: I8f4d87f5b992fb518a3d1261bec14576bcf2e91e
2020-03-07 23:14:53 +00:00
Automerger Merge Worker
65de37658f Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59 am: 020ea67ea3 am: 4e12e932c6
Change-Id: Ie07352e96a52b6aaf4dff60bf800c8e83d353c51
2020-03-07 23:14:22 +00:00
Automerger Merge Worker
f7bb8c4e62 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: cf618708e8 am: c938890c53 am: 0e727bc36c
Change-Id: Ida6c2ff7544920977898a7e31d69ed697b2e0143
2020-03-07 23:14:09 +00:00
Automerger Merge Worker
a512737c0a Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: f5d19cb558 am: af467dc447
Change-Id: Ib6ea187fbe0e6fe68d46926ff8e4ea8d59de80a7
2020-03-07 23:12:10 +00:00
Automerger Merge Worker
95e7500990 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012 am: 7c04e2f1ae am: b1f6e93a23
Change-Id: I3afd81544b454285ce7fb5e1e18a84b605151986
2020-03-07 23:10:16 +00:00
Automerger Merge Worker
4bfb3bd6a0 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440 am: c984dca0eb
Change-Id: Id5645d69dcc736fa2da38201fe60f0390f65efa3
2020-03-07 19:37:23 +00:00
Automerger Merge Worker
c984dca0eb Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6 am: 4b0e1b3440
Change-Id: I95b2d415975ea7b5b2955d6179faab021dd9f98d
2020-03-07 19:22:56 +00:00
Automerger Merge Worker
48cf7ebb43 Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp am: 7f72b3d0b6
Change-Id: If76765582d04979d6b1a4b56aa071d2f54000c00
2020-03-07 18:08:32 +00:00
Automerger Merge Worker
dcbe174ab5 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36
Change-Id: I4404bdebcba053c57122ae9931d7717a9e8904fc
2020-03-07 18:08:25 +00:00
Automerger Merge Worker
7f72b3d0b6 Merge "Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6" into rvc-d1-dev-plus-aosp 2020-03-07 17:58:12 +00:00
Automerger Merge Worker
241f426e36 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361
Change-Id: I1d748b7ebdfd430023fa5ed47d0867f8dd7a1504
2020-03-07 17:58:06 +00:00
Automerger Merge Worker
903c040612 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6
Change-Id: Iffbe972133a1980f7c524e6b4f2eaf3dd2cd2d47
2020-03-07 17:58:04 +00:00
Automerger Merge Worker
4b0e1b3440 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: 000cbb47b6
Change-Id: I414aed330d2783a5781c039c1a2e9a06cf302730
2020-03-07 17:58:03 +00:00
Automerger Merge Worker
000cbb47b6 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779
Change-Id: Ie1031fb0582a7a2955a7fcaf4eef28d2ddc0c62d
2020-03-07 17:37:50 +00:00
Automerger Merge Worker
ff11b08361 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779
Change-Id: Idfdbf2f0c4684d5fa7934937a39be401a139362a
2020-03-07 17:37:49 +00:00
TreeHugger Robot
29063e3779 Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev 2020-03-07 17:16:05 +00:00
Automerger Merge Worker
df15f18379 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099 am: ed39063010
Change-Id: If3601e7044c0e64c5fd50e94938c62915f218747
2020-03-07 14:34:53 +00:00
Automerger Merge Worker
ed39063010 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e am: 9796155099
Change-Id: I3ca51f1ac477ab329cd076713997a3896ac46022
2020-03-07 14:21:32 +00:00
Automerger Merge Worker
1d975fa486 Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp am: 3e841653dc
Change-Id: I3a167c01c60b10a258225f53364d3efa65123c72
2020-03-07 13:03:57 +00:00
Automerger Merge Worker
4e12e932c6 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59 am: 020ea67ea3
Change-Id: I2d856b616859c7eefd452f1a413e188e1d569dc7
2020-03-07 13:03:49 +00:00
Automerger Merge Worker
3e841653dc Merge "Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e" into rvc-d1-dev-plus-aosp 2020-03-07 12:50:01 +00:00
Automerger Merge Worker
e54fb4abe2 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e
Change-Id: Ic7dd524dbf984dba759f0ad0216db0f554c5b57a
2020-03-07 12:49:58 +00:00
Automerger Merge Worker
020ea67ea3 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 384841ce59
Change-Id: Iffdefa0e68f937226353dd4f2536b660acf363bc
2020-03-07 12:49:57 +00:00
Automerger Merge Worker
9796155099 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576 am: 0c08f5d44e
Change-Id: Iee76df2a320246cf05ff40a841d5ffbe38cfb11e
2020-03-07 12:49:56 +00:00
Automerger Merge Worker
384841ce59 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
Change-Id: Ib7321fd67b98731a9c822d2143316d60017bdd2e
2020-03-07 12:39:54 +00:00
Automerger Merge Worker
0c08f5d44e Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
Change-Id: Ic06643022dc0bb3cbcab00645a6e7bb7669d240b
2020-03-07 12:39:50 +00:00
TreeHugger Robot
4105c9c576 Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev 2020-03-07 12:27:45 +00:00
Automerger Merge Worker
0e727bc36c Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: cf618708e8 am: c938890c53
Change-Id: I3d96231b00377de95d5c8e5c95be969cf961e665
2020-03-06 22:57:53 +00:00
Automerger Merge Worker
af467dc447 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: f5d19cb558
Change-Id: I0822157f2e2b8d3a3c178c4517a56c4410c68fb7
2020-03-06 22:54:03 +00:00
Automerger Merge Worker
b1f6e93a23 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012 am: 7c04e2f1ae
Change-Id: I33c3dd36f979e51466d0451a444b96f05abcb3e4
2020-03-06 22:52:42 +00:00
Automerger Merge Worker
c938890c53 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3 am: cf618708e8
Change-Id: I5a21b24048d6fc7854e44d4e0f6b83b489202bb6
2020-03-06 22:52:31 +00:00
Automerger Merge Worker
f5d19cb558 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3
Change-Id: Id993d700a2132ef837f302c30942a9b41fd1e9c0
2020-03-06 22:49:31 +00:00
Automerger Merge Worker
7c04e2f1ae Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: b7f10b9012
Change-Id: Id63c7dc935e2cb68783c6052608597333ca15c7b
2020-03-06 22:46:55 +00:00
Automerger Merge Worker
cf618708e8 Merge "Update enrollment with API update" into rvc-dev am: be753c3543 am: 139caf98f3
Change-Id: I94b5cd6d6cffa70d9b77465db6541513c0c17e06
2020-03-06 22:46:06 +00:00
Automerger Merge Worker
b7f10b9012 Merge "Update enrollment with API update" into rvc-dev am: be753c3543
Change-Id: If7503971a68c00057e6256ae32f032edc8b61a2d
2020-03-06 22:45:48 +00:00
Automerger Merge Worker
139caf98f3 Merge "Update enrollment with API update" into rvc-dev am: be753c3543
Change-Id: I1c4c6ba23c4bac4ef3d88aa0e76d155b515de012
2020-03-06 22:45:14 +00:00
Kevin Chyn
be753c3543 Merge "Update enrollment with API update" into rvc-dev 2020-03-06 22:43:57 +00:00
Automerger Merge Worker
9c7ac5cc04 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 am: 9423b256fb am: fd40e9e4b8 am: 5c56e2f0f3
Change-Id: I2c2af93431d7b4aa0d7fa63842f5c41157a3e303
2020-03-06 22:33:48 +00:00
Automerger Merge Worker
f9ad75a900 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 am: 30ad1ae018 am: ebb6b02b1e
Change-Id: I33e28a9ae2fcd0adf33065ce2fb1818cbf7d3e8d
2020-03-06 22:33:26 +00:00
Automerger Merge Worker
5c56e2f0f3 Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: 0e03dfddd7 am: 9423b256fb am: fd40e9e4b8
Change-Id: I4f9eda75b0d8efce022d2e981cecd3812476a82d
2020-03-06 22:32:46 +00:00
Automerger Merge Worker
054b853b2d Merge "[Wi-Fi] Implement ConnectedWifiEntryPreference to show gear icon" into rvc-dev am: 858cf42516 am: e47d1cae4f am: 3806ccd234 am: 3ffbb869c5
Change-Id: I3e050f140686bfab641ae41f2a85c3f557b5060e
2020-03-06 22:32:37 +00:00