Automerger Merge Worker
56cf400bab
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 50aefb75b0 am: 0b02a2334f
...
Change-Id: I21da405a59a84ad88981f27de5f8ddcbb9b85281
2020-03-04 03:25:35 +00:00
Automerger Merge Worker
f76822fca2
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: 8e78fccbab -s ours am: 6877fa9338 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:25:24 +00:00
Automerger Merge Worker
3dbd8cd4f6
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: ec9c799dcc am: 40044775d2
...
Change-Id: I249c27ce2899268cb16c2677bbd819f366911c60
2020-03-04 03:25:18 +00:00
Automerger Merge Worker
ed6008efa8
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa am: ed46a7d526 am: a5e4198546
...
Change-Id: If7467b1191097fa47f93e0ff3f8419bc69967455
2020-03-04 03:24:36 +00:00
Automerger Merge Worker
0b02a2334f
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be am: 50aefb75b0
...
Change-Id: I469c712a49422b62f51b3e752658773ad6bcc3ae
2020-03-04 03:13:09 +00:00
Automerger Merge Worker
6877fa9338
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours am: 8e78fccbab -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 03:12:58 +00:00
Automerger Merge Worker
40044775d2
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e am: ec9c799dcc
...
Change-Id: I3f0202781080639f28f72cd3acf29818cc887b9c
2020-03-04 03:12:32 +00:00
Automerger Merge Worker
a5e4198546
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa am: ed46a7d526
...
Change-Id: I4fb6c1645553dc5fa17becebf219f2e6553ce128
2020-03-04 03:06:54 +00:00
Automerger Merge Worker
440a36194b
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: ad3edcf79c am: b9c8eacd9f
...
Change-Id: I5e95f2bbe12b7c0b135a5475c7e5adde6a8ff6ca
2020-03-04 03:00:05 +00:00
Automerger Merge Worker
50aefb75b0
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9 am: bc0d38d1be
...
Change-Id: I4c710e3a5ac052232139ab103205efbbbe394ca6
2020-03-04 02:59:33 +00:00
Automerger Merge Worker
28cdcd3388
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644 am: 99cb10c954 am: e30f24d763
...
Change-Id: I0b379b5dc6b04c5dff96a8b7fda93ca4886cab07
2020-03-04 02:59:30 +00:00
Automerger Merge Worker
8e78fccbab
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours am: b012406ee6 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 02:59:26 +00:00
Automerger Merge Worker
ec9c799dcc
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8 am: 55fa845f1e
...
Change-Id: If0e7aad1904e70cf550bcb8143d22962086ed65c
2020-03-04 02:59:21 +00:00
Automerger Merge Worker
b9c8eacd9f
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: ad3edcf79c
...
Change-Id: Iddac896cb27c0e55de51b6ade83df99ac2172286
2020-03-04 02:46:41 +00:00
Automerger Merge Worker
ed46a7d526
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda am: cec1f09aaa
...
Change-Id: If21fed883602541ab3566a1ba9b70f2d92032976
2020-03-04 02:45:35 +00:00
Automerger Merge Worker
e30f24d763
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644 am: 99cb10c954
...
Change-Id: I3e35f7482df28b9c391f32becbbb6fb364bf4e7f
2020-03-04 02:45:14 +00:00
Automerger Merge Worker
bc0d38d1be
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev am: 09ff25cdf9
...
Change-Id: Id1ca213df71e06a33d89b7d1e510b75b74ace8c6
2020-03-04 02:38:54 +00:00
Automerger Merge Worker
b012406ee6
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours am: d6f421d593 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 02:38:45 +00:00
Automerger Merge Worker
55fa845f1e
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev am: e64fb77bc8
...
Change-Id: I84001a5c44becfe7d8590e8097dbf99f6aed2eb9
2020-03-04 02:38:35 +00:00
tim peng
09ff25cdf9
Merge "Add slice for dynamic grouping in output switcher" into rvc-dev
2020-03-04 02:35:35 +00:00
Automerger Merge Worker
ad3edcf79c
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
...
Change-Id: I07b6bd9ff2ab5ee82c116c83a2d4f1ea8fe69f27
2020-03-04 02:32:59 +00:00
Automerger Merge Worker
cec1f09aaa
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: 7d7ddddcda
...
Change-Id: Ia8b5455a7856747dda56a94dea22c0f6a1d38eec
2020-03-04 02:32:59 +00:00
Automerger Merge Worker
99cb10c954
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82 am: b3ff936644
...
Change-Id: I5638d4c12907aea63a9f61b0c0dc3cea4d8115a0
2020-03-04 02:32:42 +00:00
Automerger Merge Worker
d6f421d593
[automerger skipped] [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 -s ours
...
am skip reason: Change-Id Iab35ac975933abc54fda83b99a2109d53d6722d4 with SHA-1 9730b5aa86
2020-03-04 02:32:26 +00:00
Arc Wang
e64fb77bc8
Merge "[Wi-Fi] Apply WifiEntry onUpdate to support refresh WiFi detail page for OpenRoaming feature." into rvc-dev
2020-03-04 02:25:38 +00:00
Automerger Merge Worker
b3ff936644
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
...
Change-Id: I8fc697e7682b9da3243b2050820d1b0ba59efebb
2020-03-04 02:04:23 +00:00
Automerger Merge Worker
7d7ddddcda
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
...
Change-Id: I925eec066c43a8befeef41d40cad7ecfb2b6fb86
2020-03-04 02:04:18 +00:00
Automerger Merge Worker
dcf18af961
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9 am: 9ad579bfe6 am: 969e0fddc6
...
Change-Id: Ic0dbe06c9583f519907c5d5abbe0d24f26d26a31
2020-03-04 01:58:39 +00:00
Automerger Merge Worker
30d693cd85
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 am: 0b924d6cad am: 8029e937dd
...
Change-Id: I4bd3187185554aa1400891176160aebe8ac537a7
2020-03-04 01:57:59 +00:00
Automerger Merge Worker
7d1749cb78
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303 am: 8ae78e19a9
...
Change-Id: I5da69404be6bda5c9c462b10d8e7e8ad5019edb0
2020-03-04 01:56:34 +00:00
Automerger Merge Worker
969e0fddc6
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9 am: 9ad579bfe6
...
Change-Id: I1a8d2a648ae152542968de06e5c1a368cc9cad4b
2020-03-04 01:55:45 +00:00
Zhen Zhang
5dbf99de82
Merge changes I3b1d1c4e,I11bdad27 into rvc-dev
...
* changes:
Let tether preference controllers extend TogglePreferenceController
Make tether option preferences listen to own SharedPreferences change
2020-03-04 01:53:07 +00:00
Automerger Merge Worker
8029e937dd
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322 am: 0b924d6cad
...
Change-Id: I54c0103e8b490a0423d968a1a2193243582929aa
2020-03-04 01:42:48 +00:00
Automerger Merge Worker
9ad579bfe6
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: eb31d86af9
...
Change-Id: I2cb340913046145917130697dcf188fa372c0e86
2020-03-04 01:40:49 +00:00
Automerger Merge Worker
8ae78e19a9
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a am: 0d7209e303
...
Change-Id: Ia3d5e817750c398575c1116072a5b179e00702bf
2020-03-04 01:40:08 +00:00
Automerger Merge Worker
0b924d6cad
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 61c7581322
...
Change-Id: I58d050e865f53aef709be9b27d3865e3307b8729
2020-03-04 01:26:45 +00:00
Automerger Merge Worker
eb31d86af9
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
...
Change-Id: I131d6f9021fe9840b9617af4dfe5d6265371831e
2020-03-04 01:26:42 +00:00
Automerger Merge Worker
0d7209e303
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5 am: 9aebc16b6a
...
Change-Id: I34ef1774e79d6b280d34fb2298f316c15ea1480e
2020-03-04 01:26:24 +00:00
Automerger Merge Worker
61c7581322
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5
...
Change-Id: I65ba4dcd05836f14b94da7811fc37ba92521efaf
2020-03-04 01:13:19 +00:00
Automerger Merge Worker
9aebc16b6a
Merge "Add string for output switcher transferring error" into rvc-dev am: 8c07f06cd5
...
Change-Id: Iac9a8770e495bcb01a8fc87436af66378f2c2b1f
2020-03-04 01:13:07 +00:00
tim peng
8c07f06cd5
Merge "Add string for output switcher transferring error" into rvc-dev
2020-03-04 00:55:01 +00:00
Zhen Zhang
abb734920d
Let tether preference controllers extend TogglePreferenceController
...
Refactored USBTether, BluetoothTether and WifiTetherDisable preference
controllers to extend TogglePreferenceControllers, since they are all
SwitchPreference.
Bug: 150634051
Test: UsbTetherPreferenceControllerTest,
BluetoothTetherPreferenceControllerTest,
WifiTetherDisablePreferenceControllerTest,
CodeInspectionTest
Change-Id: I3b1d1c4e678c65ced8dd506a87c3c43ed300d64f
2020-03-03 11:28:18 -08:00
Automerger Merge Worker
5c3675575d
Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp am: ed6a726216
...
Change-Id: I25d63fcb913f9d506e4ef3890662d54ed8eaf13a
2020-03-03 12:58:33 +00:00
Automerger Merge Worker
ccaacf5e00
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 am: e358b7ab8c am: 2c2c1b9540
...
Change-Id: I7acde12cd35cbbf2cf5a5d7a5e99c7ae17b600f7
2020-03-03 12:58:25 +00:00
Automerger Merge Worker
c22840f7ec
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20 am: 9c00d5db7b
...
Change-Id: If0a32e40551cb39287b248ff481d8f60bc1e3610
2020-03-03 12:58:18 +00:00
Automerger Merge Worker
ed6a726216
Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp
2020-03-03 12:42:18 +00:00
Automerger Merge Worker
860971a028
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc
...
Change-Id: I6b9b3f0705d0f479da006ecca58f12b086c60310
2020-03-03 12:42:14 +00:00
Automerger Merge Worker
2c2c1b9540
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 43d72405b5 am: e358b7ab8c
...
Change-Id: I104dab937a60a4f2b9cf03deeee9bd6a204765af
2020-03-03 12:42:11 +00:00
Automerger Merge Worker
9c00d5db7b
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3cee900a20
...
Change-Id: I70979fafb82a2986ebc582723c6d79c5e0a524b0
2020-03-03 12:42:01 +00:00
Automerger Merge Worker
3a059026bc
Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9
...
Change-Id: Icfd47c2e0d5dfcb04347167fb31c4cbda59a7bf1
2020-03-03 12:25:31 +00:00
