TreeHugger Robot
24b6c52d7a
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 854559e572 am: 8985a8dc5e am: e7810dbed8
...
Change-Id: I60d715295a54c86063baeccc8167ed41b8fc7e73
2020-04-08 08:27:56 +00:00
TreeHugger Robot
e7810dbed8
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 854559e572 am: 8985a8dc5e
...
Change-Id: I1912b454b9eec6b7c188b239a8bf1a87491c119a
2020-04-08 08:18:06 +00:00
TreeHugger Robot
adb10f140a
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 02ba3d1e30 am: 1a7b4d8416 am: 38581db7ad
...
Change-Id: I1fa0131e3f832fe0a4ef5988b62712e4d45ad574
2020-04-08 08:17:59 +00:00
TreeHugger Robot
acf8fc5939
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 506a2394d0 am: 4621014df5
...
Change-Id: I58a4484659736ed5541ee26fc7fc794436c590e3
2020-04-08 08:17:51 +00:00
TreeHugger Robot
38581db7ad
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 02ba3d1e30 am: 1a7b4d8416
...
Change-Id: If202df6764a9dc25c92bd93f8e1e0ca5a625380e
2020-04-08 07:57:39 +00:00
TreeHugger Robot
4621014df5
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 506a2394d0
...
Change-Id: If23c5ebcbea0eac3376596aeaa2d12cd68a5de85
2020-04-08 07:57:32 +00:00
TreeHugger Robot
8985a8dc5e
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 854559e572
...
Change-Id: I0680df9e735908abed0f73752966f44ea118f020
2020-04-08 07:57:28 +00:00
TreeHugger Robot
1a7b4d8416
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 02ba3d1e30
...
Change-Id: Ic2441347cbaeb8bedda4b5caee0605994545cc4b
2020-04-08 07:46:06 +00:00
TreeHugger Robot
854559e572
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277
...
Change-Id: Icc5688817560e1db448357bfd7a62cd184236ef8
2020-04-08 07:46:03 +00:00
Bonian Chen
7344a5708e
[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours am: 8d8e0754f4 -s ours am: eb3b228253 -s ours am: 7b069bb47c -s ours
...
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86
2020-04-08 07:45:54 +00:00
TreeHugger Robot
506a2394d0
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277
...
Change-Id: I00572d5c7dd3905f094fdd052ebf76aea7fcb774
2020-04-08 07:45:52 +00:00
TreeHugger Robot
02ba3d1e30
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
...
Change-Id: I376352c94fac2b8fcf9f20e0d176e17efdfdbdfc
2020-04-08 07:38:19 +00:00
Bonian Chen
7b069bb47c
[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours am: 8d8e0754f4 -s ours am: eb3b228253 -s ours
...
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86
2020-04-08 07:38:11 +00:00
TreeHugger Robot
800cc2c277
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
...
Change-Id: Iafb889858cd911b7b684eb92d09344ac7371e1f3
2020-04-08 07:38:10 +00:00
Bonian Chen
eb3b228253
[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours am: 8d8e0754f4 -s ours
...
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86
2020-04-08 07:26:05 +00:00
Xin Li
e250e08912
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours am: 01c50b7bc6 -s ours am: 63468ecd9e -s ours am: 554b0e7845 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I74b46642f5de5b4f6a3543ceefcce8a903bd92c9
2020-04-08 07:24:03 +00:00
TreeHugger Robot
1e49ff8ba7
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev
2020-04-08 07:23:53 +00:00
Xin Li
554b0e7845
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours am: 01c50b7bc6 -s ours am: 63468ecd9e -s ours
...
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d
2020-04-08 07:11:40 +00:00
Bonian Chen
8d8e0754f4
[automerger skipped] Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 -s ours
...
am skip reason: Change-Id Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157 with SHA-1 073f483d86
2020-04-08 07:10:56 +00:00
Xin Li
63468ecd9e
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours am: 01c50b7bc6 -s ours
...
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d
2020-04-08 06:59:02 +00:00
Bonian Chen
733530e086
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b
...
Change-Id: If4f0e4b0c0d44ee6b7387a4a94c44d949706c557
2020-04-08 06:56:14 +00:00
Xin Li
01c50b7bc6
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I85a3023bc4b1ac9758a0a87b933296f11b978904
2020-04-08 06:40:46 +00:00
Bonian Chen
fe22ecad9b
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API"
2020-04-08 06:40:10 +00:00
Bonian Chen
d9957643d9
[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API
...
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.
Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
Merged-In: I350604a64a56151195f52d38bd258e34c76e40c5
Change-Id: I4fc89e91381b1562ee7e2f48cfc159949c81a414
2020-04-08 06:38:10 +00:00
Xin Li
35fb83fed6
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours
...
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d
2020-04-08 06:30:50 +00:00
Xin Li
ad360f14a6
Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master"
2020-04-08 06:26:03 +00:00
TreeHugger Robot
5dd64aeef2
Merge "Import translations. DO NOT MERGE"
2020-04-08 05:50:29 +00:00
Bonian Chen
21373efdf7
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: c0c78129c8 am: 7939abdcdc am: 33cb0fa6b9
...
Change-Id: Id2cff32c73a215563a349203f99f17e28fbaf8ce
2020-04-08 05:49:40 +00:00
Bonian Chen
af151d7c75
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: 1afdc562db am: 091a0ebc85
...
Change-Id: I44d384f264e601ba8c32e43e99f36bece0549e75
2020-04-08 05:49:21 +00:00
Bonian Chen
1e6c45adad
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours am: 8ab7db3359 -s ours am: 7322f57974 -s ours am: 2fb82ffac9 -s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
2020-04-08 05:49:06 +00:00
Bonian Chen
33cb0fa6b9
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: c0c78129c8 am: 7939abdcdc
...
Change-Id: I1c7e92823688311a04c717209f8ed960e56e8c8d
2020-04-08 05:48:56 +00:00
Bonian Chen
9186d9d749
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: a93ddbc42f am: b1b0d9981a am: e01cebc885
...
Change-Id: If3d35c40f4d585ef0922fbde9e1f1301a5aaf013
2020-04-08 05:48:45 +00:00
Bonian Chen
091a0ebc85
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: 1afdc562db
...
Change-Id: Ic014fedafca2e2f491d2a26a3e2c710a27c241e3
2020-04-08 05:35:26 +00:00
Bonian Chen
2fb82ffac9
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours am: 8ab7db3359 -s ours am: 7322f57974 -s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
2020-04-08 05:35:20 +00:00
Bonian Chen
e01cebc885
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: a93ddbc42f am: b1b0d9981a
...
Change-Id: I11bd7298c1397f00a1ba598fc9637a88b287700b
2020-04-08 05:35:06 +00:00
Bonian Chen
7939abdcdc
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee am: c0c78129c8
...
Change-Id: I62468efd3412cebe9bcaf843d29178f9441819b5
2020-04-08 05:34:54 +00:00
Bonian Chen
1afdc562db
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee
...
Change-Id: I2bfd26b4715b9dc701649e8a86ff3ac7a7f6a36b
2020-04-08 05:23:36 +00:00
Bonian Chen
7322f57974
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours am: 8ab7db3359 -s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
2020-04-08 05:21:57 +00:00
Bonian Chen
b1b0d9981a
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: a93ddbc42f
...
Change-Id: I420e7078ea39f8ea2a110c5156911a5f40497b2d
2020-04-08 05:21:43 +00:00
Bonian Chen
c0c78129c8
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258 am: 403c8aa4ee
...
Change-Id: I0738d3cac701a396f334ace6b0a6ea309bd11c13
2020-04-08 05:21:36 +00:00
Bonian Chen
8ab7db3359
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd -s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
2020-04-08 05:21:24 +00:00
Bonian Chen
c034169ccd
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b
...
Change-Id: I36f17b8206bd397306dca9d37e2bd3cf48700321
2020-04-08 05:08:49 +00:00
Bonian Chen
a93ddbc42f
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
...
Change-Id: I793ec6eca3bab04122ebcd5e6a957d16fe14f5e0
2020-04-08 05:03:17 +00:00
Bonian Chen
403c8aa4ee
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
...
Change-Id: I59eea93d852d4397306099e14c202c795761a446
2020-04-08 05:03:08 +00:00
Bonian Chen
4e8786c09b
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option."
2020-04-08 04:57:12 +00:00
Bonian Chen
05cb60b258
Merge "[Settings] Code refactor" into rvc-dev
2020-04-08 04:52:23 +00:00
Bonian Chen
86a519ab77
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: 9140b1d29f am: 03e935f435 am: d9fadefbe3 am: 84e2758ac7
...
Change-Id: Iad0cc1fee4d22cac2fc167f35f6f0540b4414896
2020-04-08 04:26:16 +00:00
tim peng
6d97968b7e
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 76b3da3eee am: 21ca7a4348 am: 99aa7b79f4
...
Change-Id: I63fc278e0e264dc54940ede0970befb2c42ec311
2020-04-08 04:26:08 +00:00
tim peng
1dfe7a1503
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 6e423144e7 am: a789813202 am: f0ebb2620b
...
Change-Id: I096012690aac2770d294a722cc0c96d4b9df0d98
2020-04-08 04:25:39 +00:00
Bonian Chen
45717ebb0c
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours am: 9be78b056f -s ours am: 27ac6ed0a3 -s ours am: 4667eae476 -s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
2020-04-08 04:25:32 +00:00
