Automerger Merge Worker
4a4ee98a19
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
...
Change-Id: I50df00daa2471adc120a9934febc4554a3608bde
2020-03-05 03:15:33 +00:00
Automerger Merge Worker
60bc99d812
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
...
Change-Id: I246edbade67850ad044e7d7532c8cdde3c40ce32
2020-03-05 03:15:24 +00:00
Automerger Merge Worker
35014d26ed
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
...
Change-Id: I4f9570ea05ef71ae565fc1950c766f3d7bd8b618
2020-03-05 03:15:14 +00:00
Automerger Merge Worker
ccfe8c6624
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
...
Change-Id: I50f84bf17daa3fc36b2bc40c953fe398ee5e34ad
2020-03-05 03:14:56 +00:00
Zhen Zhang
042aa85b50
Merge "Update SharedPreference values based on tethering state" into rvc-dev
2020-03-05 02:58:24 +00:00
TreeHugger Robot
d9f611fe6b
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev
2020-03-05 02:57:24 +00:00
changbetty
081414e84d
[Telephony Setting] Enable the Settings test case
...
Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AirplaneModePreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkPreferenceControllerTest
Change-Id: I192385b1d847323d18ebc621f29ccc65cd7473d8
2020-03-05 10:21:54 +08:00
Steven Liu
cc6eb5c0f7
Remove the unnecessary dependent on WifiTrackerLib.
...
Bug: 150467119
Test: build
Change-Id: I947d4ee2f88aadc2d8b2002a2c5b04f60c4d853b
2020-03-04 14:51:27 -08:00
Automerger Merge Worker
65721fd160
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours am: 12f8e63501
-s ours am: 8ee1f8c4de
-s ours am: 2a9dfad43e
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iba87b6051ae4045b5e3a925503c2ffa88def975f
2020-03-04 22:06:33 +00:00
Automerger Merge Worker
2a9dfad43e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours am: 12f8e63501
-s ours am: 8ee1f8c4de
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia1dd3b9745a2a930f4c534fd6f150fa2776efdb0
2020-03-04 22:00:14 +00:00
Automerger Merge Worker
5914bb4b60
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: c49ada9182
-s ours am skip reason: subject contains skip directive" into rvc-d1-dev-plus-aosp am: 319779dcc6
-s ours am: 9359e18849
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7a760ba6c3185bec69ff92a71c028536a31804db
2020-03-04 22:00:11 +00:00
Automerger Merge Worker
66c944e7d2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours am: 318fcbbd52
-s ours am: 88e35e90d2
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibdee27c0545bc1607761257afa775fc131908785
2020-03-04 22:00:05 +00:00
Automerger Merge Worker
9359e18849
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: c49ada9182
-s ours am skip reason: subject contains skip directive" into rvc-d1-dev-plus-aosp am: 319779dcc6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I9c10bc3564b7afc3e78a023555f27d71dfcfd135
2020-03-04 21:43:13 +00:00
Automerger Merge Worker
88e35e90d2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours am: 318fcbbd52
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I6db9298a2fca6aec3231741fe6fca9ccbf016d2a
2020-03-04 21:43:05 +00:00
Automerger Merge Worker
8ee1f8c4de
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours am: 12f8e63501
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I37b213830cc6771576efbebe849cb3c681ba8198
2020-03-04 21:43:04 +00:00
Automerger Merge Worker
319779dcc6
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: c49ada9182
-s ours am skip reason: subject contains skip directive" into rvc-d1-dev-plus-aosp
2020-03-04 21:24:28 +00:00
Automerger Merge Worker
24de3fbf97
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: c49ada9182
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I194b0cac70dc5a0b1a364e9ceb559df9962f9985
2020-03-04 21:24:25 +00:00
Automerger Merge Worker
318fcbbd52
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iad4a9c8271bf2f3d34c9d451fb2fc6b90e2de27f
2020-03-04 21:24:23 +00:00
Automerger Merge Worker
12f8e63501
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I48f8b41a1c3efc8953d1e8f98b60ac37e275167a
2020-03-04 21:24:09 +00:00
Automerger Merge Worker
c49ada9182
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibd939d46e2bcc31623f69049c6a06015e39c137a
2020-03-04 21:13:02 +00:00
Automerger Merge Worker
ff29ca26c5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3a70d3e9d49991434380da5f9b72baa50a0f916d
2020-03-04 21:12:53 +00:00
TreeHugger Robot
b79218f56d
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-04 20:59:22 +00:00
Automerger Merge Worker
d5eb235e41
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours am: bf7796baec
-s ours am: b807d163a7
-s ours am: 2f708613a5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic170cffdb4b3701d592bc2d93e7a155b400c0e6d
2020-03-04 20:51:32 +00:00
Automerger Merge Worker
d86cf34a91
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: 306d47bca5
-s ours am: ed8a3467a3
-s ours am: 55b0571d37
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I199bd28205eb9d2ee4fb0f71671c4160d4d1630d
2020-03-04 20:51:15 +00:00
Automerger Merge Worker
e0503898c6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours am: 479eb958c8
-s ours am: 7c60678531
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8ac1fb9fd5e7d9ea264d898211157544d37a59fd
2020-03-04 20:50:44 +00:00
Automerger Merge Worker
2f708613a5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours am: bf7796baec
-s ours am: b807d163a7
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I54eccf78a196e5a4066f3fe41eebcd261c32b3ba
2020-03-04 20:50:26 +00:00
Automerger Merge Worker
55b0571d37
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: 306d47bca5
-s ours am: ed8a3467a3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I56f51749f173969e69422e38c384e5bc15a9dd3a
2020-03-04 20:34:57 +00:00
Automerger Merge Worker
b807d163a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours am: bf7796baec
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I2ef189f15acb569f9c5aa573ee1ff58cdff29618
2020-03-04 20:34:45 +00:00
Automerger Merge Worker
7c60678531
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours am: 479eb958c8
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I9cf5b24bd17b91050076760d8baeab019c1e0b15
2020-03-04 20:34:12 +00:00
TreeHugger Robot
5c7c573a83
Merge "Import translations. DO NOT MERGE"
2020-03-04 20:32:39 +00:00
Automerger Merge Worker
ed8a3467a3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: 306d47bca5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5db4fafec9e8f1745b3c0b842442593888135e16
2020-03-04 20:11:05 +00:00
Automerger Merge Worker
bf7796baec
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I03c6634dc6ec628fc4e3f565d72ed4a1d04cc3f8
2020-03-04 20:11:03 +00:00
Automerger Merge Worker
479eb958c8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I204cea9f138462beb6b0ffca74df7e3b46e0a354
2020-03-04 20:10:50 +00:00
Automerger Merge Worker
306d47bca5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5977827c3ebecc7f3055d491922d875f6f8a88a3
2020-03-04 19:53:34 +00:00
Automerger Merge Worker
b43406147b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifdeb07456af76024e651cf6723c71bcb037762f8
2020-03-04 19:53:27 +00:00
Automerger Merge Worker
e0bc29df11
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I98d470799b1ddddd9cc497d4f3729f2d04fd613c
2020-03-04 19:40:30 +00:00
Automerger Merge Worker
6151b0b9b6
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
am: 94bdc99fac
am: 2f5305fc55
am: c7ec01650b
...
Change-Id: I6e22fe61f50448081d1078b4a29ecaf39304af43
2020-03-04 19:33:56 +00:00
Automerger Merge Worker
e2c0917c59
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: 12d9e009a6
am: c3b6944712
am: c4eb266c4e
...
Change-Id: I51af8982a6eb5322a2fd5bdddcda46f34f98b79e
2020-03-04 19:31:17 +00:00
Automerger Merge Worker
c7ec01650b
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
am: 94bdc99fac
am: 2f5305fc55
...
Change-Id: Id05c21495684cea1cdce9bdf4161a9f78d2b913f
2020-03-04 19:29:51 +00:00
Automerger Merge Worker
4a92db602c
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
am: 57e5809c32
am: cf282bf658
...
Change-Id: I22a2016e153fabe5696b6517baeca84018fdbfee
2020-03-04 19:28:58 +00:00
TreeHugger Robot
3779025590
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-03-04 19:24:28 +00:00
Zhen Zhang
0c02d33818
Update SharedPreference values based on tethering state
...
TetherEnabler need to update tethering state of each tethering
interfaces to make sure other preferences that depends on these
SharedPreferences be consistent with UI.
Bug: 148968321
Test: TetherEnablerTest; CodeInspectionTest. Manully test, built and
flashed to crosshatch device.
Change-Id: Ie0be7748adf20e6fb0ff5489795b0ca0664b6323
2020-03-04 10:59:29 -08:00
Automerger Merge Worker
c4eb266c4e
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: 12d9e009a6
am: c3b6944712
...
Change-Id: I15299b488f8b7b066e51127ec2eff00b830d321d
2020-03-04 18:48:48 +00:00
Automerger Merge Worker
cf282bf658
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
am: 57e5809c32
...
Change-Id: I56af323318471195dae8fb3cb37f907910f7f39d
2020-03-04 18:47:08 +00:00
Automerger Merge Worker
2f5305fc55
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
am: 94bdc99fac
...
Change-Id: Ief1f65f7bce92d20443fa61b70086b74f0a76ccc
2020-03-04 18:40:51 +00:00
Automerger Merge Worker
e65b7fa83f
Merge "Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
am: 3a3d457968" into rvc-d1-dev-plus-aosp am: 93375e2f15
am: 6b2ceffdcf
...
Change-Id: Ibed1ab87abd42db3ecebb98c3dc92f8ac642f799
2020-03-04 18:38:23 +00:00
Automerger Merge Worker
16b8bc53d4
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
am: b08e748c54
am: 9cb57e5c3a
am: 4de829aad2
...
Change-Id: I015e8a3f69967f34b596f649aa08983d17eae210
2020-03-04 18:37:59 +00:00
Automerger Merge Worker
a733bfdc59
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
am: 3a3d457968
am: 1afd37690e
am: 00e3a7e9d7
am: dbbb23f8d3
...
Change-Id: I700b11837e690dde04321cc6acd9de6254da1f69
2020-03-04 18:33:01 +00:00
Automerger Merge Worker
e8635b6061
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4
am: d53f368e7e
am: 7a315bda17
am: 4e83ec6f61
...
Change-Id: I0b22d26c6dbab6a77c31e99538b83486d5678d6c
2020-03-04 18:32:29 +00:00
Automerger Merge Worker
52a5d1619c
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4
am: 9a8777e083
am: 7a04498c3f
am: 8fe2b22d7a
...
Change-Id: Iacfdeb088f1e554ad59d2ceaff374e9c5064c6ee
2020-03-04 18:31:25 +00:00