Xin Li
ad360f14a6
Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master"
2020-04-08 06:26:03 +00:00
mincheli
5c108a0b27
Add back the entrance of magnification settings in master branch
...
Bug: 146473544
Test: make RunSettingsRoboTests
Change-Id: I2e040c0b722944077dd026c32f195e5a45a52c88
2020-04-08 14:24:59 +08: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
govenliu
a82d2c8a88
[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need.
...
The Openroaming help button should show only when the getHelpUriString() value is not null, and need to handle the click event in Settings APP.
Bug: 146669261
Test: Adjust unit test cases:
1. make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
2. make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I27a717c3014b01cc464908bac56f64bd08aa5da3
2020-04-08 13:41:15 +08: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
Bonian Chen
899ad68746
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: ca4d249fc9 am: d0b5dd2d20 am: ec9a21f5a9
...
Change-Id: I8748d0195b6faefe6729decd5641f3ac1dd50fa0
2020-04-08 04:25:25 +00:00
tim peng
4c2804c083
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: fa54aab4d1 am: a9fad2e73d am: 744d1e2b05
...
Change-Id: I736792af738df4fef0660ba7183bac58c8728931
2020-04-08 04:25:17 +00:00
Automerger Merge Worker
a574f5e507
Merge "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" into rvc-d1-dev-plus-aosp am: 4d4ff44795 am: d8414840e4
...
Change-Id: I7450e929ed8a9d8227a27a6fd2930986cf76a106
2020-04-08 04:25:10 +00:00
Automerger Merge Worker
e85e0e7b10
Merge "Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: 778317679a" into rvc-d1-dev-plus-aosp am: fed400e8bd am: a6d2ffeff1
...
Change-Id: I1778bc65ce4c0d21a6cbadc23047f5885a778bfc
2020-04-08 04:25:03 +00:00
Bonian Chen
84e2758ac7
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
...
Change-Id: Ia06d7239e0d1068f4009fb89c3f4ee3cc3340e76
2020-04-08 04:25:02 +00:00
tim peng
99aa7b79f4
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 76b3da3eee am: 21ca7a4348
...
Change-Id: I6b7ff9d0d0e3f33978694e7f1535cfce3ff66fba
2020-04-08 04:24:55 +00:00
tim peng
e1c7ec38a9
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 91c389b9a2 am: 100703a82b
...
Change-Id: Iac371239bf42a390ab76143bbbc6765a0d9bf03c
2020-04-08 04:24:40 +00:00
tim peng
f0ebb2620b
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 6e423144e7 am: a789813202
...
Change-Id: I4aba86d198fb763e45187ad978ceaf6afa5f1c88
2020-04-08 04:24:38 +00:00
tim peng
60aa5b2569
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 38315ae8af am: 4aa0d4d13a
...
Change-Id: I660e65161451a83241c9d67d66ff7dc626860194
2020-04-08 04:24:20 +00:00
Bonian Chen
4667eae476
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours am: 9be78b056f -s ours am: 27ac6ed0a3 -s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
2020-04-08 04:23:56 +00:00
Bonian Chen
27ac6ed0a3
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours am: 9be78b056f -s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
2020-04-08 04:12:03 +00:00
Bonian Chen
ec9a21f5a9
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev am: bb9fbb60f0 am: ca4d249fc9 am: d0b5dd2d20
...
Change-Id: Iab9275062f681544418e092939c2d3a75722269b
2020-04-08 04:05:03 +00:00
tim peng
744d1e2b05
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: fa54aab4d1 am: a9fad2e73d
...
Change-Id: I37becaec8153ed50b33b74487bd4536dafd92728
2020-04-08 04:04:58 +00:00
Automerger Merge Worker
d8414840e4
Merge "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" into rvc-d1-dev-plus-aosp am: 4d4ff44795
...
Change-Id: I44203a6cbf4a0d0a9545df58695731b7e6caf090
2020-04-08 04:04:53 +00:00
Automerger Merge Worker
a6d2ffeff1
Merge "Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: 778317679a" into rvc-d1-dev-plus-aosp am: fed400e8bd
...
Change-Id: I8a93427d4fede1bba87d42cadf0167ff5e1016a8
2020-04-08 04:04:44 +00:00
tim peng
100703a82b
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 91c389b9a2
...
Change-Id: I34c3cc3f30ded70504d1ed3a1f8949deb8917723
2020-04-08 04:04:37 +00:00
Bonian Chen
d9fadefbe3
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
...
Change-Id: If482e609b9b7d043082af4c06ad0f31b3bbcda2d
2020-04-08 04:04:32 +00:00
tim peng
21ca7a4348
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 76b3da3eee
...
Change-Id: I6611149863e814988ec4d7f6252517a60f1cf538
2020-04-08 04:04:27 +00:00
tim peng
4aa0d4d13a
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 38315ae8af
...
Change-Id: I26fcb6afddf154115e5bd5bcd23a3fdb1229ee7e
2020-04-08 04:04:16 +00:00
tim peng
a789813202
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 6e423144e7
...
Change-Id: I4296dce2d19f8615be409884fc04057d0b7427b2
2020-04-08 04:04:07 +00:00
Arc Wang
067757f8d9
[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2
...
PreferenceGroup in a controller is not in a RecyclerView,
TalkBack loses focus after PreferenceGroup#removeAll.
To fix it, only add/remove the preference if it's necessary.
Bug: 153278854
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test
Change-Id: Ie9ad5481c33865dce2b7db04d0f969b1f49b80e1
2020-04-08 11:58:27 +08:00
Bonian Chen
9be78b056f
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 -s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
2020-04-08 03:54:23 +00:00
Bonian Chen
03e935f435
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
...
Change-Id: Ibc81e28dc1a5c4ae07199c2627035d2e4f6716d3
2020-04-08 03:50:47 +00:00
