Commit Graph

56065 Commits

Author SHA1 Message Date
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
f479860538 Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8
Change-Id: Ibe3343a47e156e632b4271bf50bd5773c7c3cbf9
2020-04-08 03:54:35 +00:00
Bonian Chen
b35536dda8 Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c
Change-Id: I3c8fb5dc82165f42e6bee5742cddc48d934684ed
2020-04-08 03:41:01 +00:00
Bonian Chen
449f76d55c Merge "[Settings] Changes for supporting replacing ImsManager" 2020-04-08 03:20:43 +00:00
TreeHugger Robot
f87724e433 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a -s ours
am skip reason: subject contains skip directive

Change-Id: I43e1a657e66f0fafc157b210e131c31364d463c1
2020-04-08 00:37:14 +00:00
TreeHugger Robot
5064d96e3a Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-08 00:18:18 +00:00
Bill Yi
b218b3e0a7 [automerger skipped] Import translations. DO NOT MERGE am: ae901dc181 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d6ad0248f38464cb4e4c16dc6b4d07646857836
2020-04-08 00:11:15 +00:00
Bill Yi
31e944a20a Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5302a1941d87bc6bc89039c91b5e4799f94259ec
2020-04-07 15:50:51 -07:00
Bill Yi
ae901dc181 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I7094db11ac59ba3a27a9767e0b75b33ebe3a42f7
2020-04-07 15:17:43 -07:00
Benedict Wong
1c69a8282c Fix VPN settings UI to validate IPsec Identifier
This change ensures that the updateUiControls() (and validate()
transitively) is called whenever the IPsec identifier is updated.

Bug: 152811464
Test: Manual testing with settings UI
Change-Id: I6536652a60244c3fde3f65211f9d0709145c6cd9
2020-04-07 11:34:46 -07:00
Xin Li
9dc49223ab DO NOT MERGE - Merge QQ2A.200405.005 into master
Bug: 150877681
Merged-In: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Change-Id: Ia97ace340fa53229dd3ebbe0caa09ab996755b5a
2020-04-07 11:29:38 -07:00
Bonian Chen
5a31b13971 [Settings] "Data during calls" in DDS SUB is still in advanced option.
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Merged-In: I0121f06efb5257dccc05ad06b93a9db263f012b5
Change-Id: I6c8802aeb7b4f4850cb143e70a9e06de9fd93902
2020-04-07 20:11:09 +08:00
Bonian Chen
d6879ac38e Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01
Change-Id: Ic323de2fbac45591c80d727b86aadad292c3dc8b
2020-04-07 08:30:59 +00:00
Bonian Chen
d998b07a01 Merge "[Settings] Refactor TelephonyConstants" am: 9371311309
Change-Id: I58dad89c087419ff07438ba02d08cde9d0e874ca
2020-04-07 08:15:41 +00:00
Treehugger Robot
e50b81128d Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee
Change-Id: Id76cad599bfd29182de1b018e708f3beb7089227
2020-04-07 08:10:43 +00:00
Bonian Chen
9371311309 Merge "[Settings] Refactor TelephonyConstants" 2020-04-07 08:05:32 +00:00
Treehugger Robot
41087780ee Merge "Button text for app space management is overwritten" am: 1d47b76cb5
Change-Id: Ibd3486cb9338e910049e1e2bc9febb751575320b
2020-04-07 07:58:27 +00:00
Treehugger Robot
1d47b76cb5 Merge "Button text for app space management is overwritten" 2020-04-07 07:39:37 +00:00
Treehugger Robot
645009fd34 Merge "Make URLs in Wi-Fi Calling help description clickable" am: 1118235580 am: f1f6f6f366
Change-Id: I434c5f1370ac604e7165fbb07a48b0f1aca5cec5
2020-04-07 04:59:29 +00:00
Bonian Chen
de782936f2 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" am: 12677c26f4 am: 3b7041d9f3
Change-Id: I6b3308cddd6bc1e5afca32a5c73b2bcad63bf362
2020-04-07 04:59:24 +00:00
Treehugger Robot
f1f6f6f366 Merge "Make URLs in Wi-Fi Calling help description clickable" am: 1118235580
Change-Id: Ia9e9a95554f4e0305ab4f73143574056c048fbb4
2020-04-07 04:40:07 +00:00
Bonian Chen
3b7041d9f3 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" am: 12677c26f4
Change-Id: I673a260ee1f1175198090c0ec87e989b34bd3635
2020-04-07 04:39:57 +00:00
Treehugger Robot
1118235580 Merge "Make URLs in Wi-Fi Calling help description clickable" 2020-04-07 04:28:30 +00:00
Bonian Chen
12677c26f4 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" 2020-04-07 04:20:35 +00:00
Bonian Chen
3edefe0fff [Settings] Refactor TelephonyConstants
Refactor TelephonyConstants

Bug: 150352656
Test: make
Change-Id: Ie8ede8ef65e71afbf3435d345751236878493a69
Merged-In: If0552d7ce20de5941667aa64e682202aaf32c597
2020-04-07 04:17:49 +00:00
Treehugger Robot
1bac10a342 [automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977 am: 7ca7469230 -s ours
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e is in history

Change-Id: Ieeab9f3023076bebf2576f7028da68cbd82fda5c
2020-04-07 03:57:53 +00:00
Treehugger Robot
7ca7469230 Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977
Change-Id: Ib9bbc21fec23a32a6b6cc425196b1150976c2386
2020-04-07 03:36:56 +00:00
Treehugger Robot
24d96a8977 Merge "Hide unprovisioned MDN (phone number) at select profile dialog" 2020-04-07 03:15:25 +00:00
Daniel Bright
55a8cd6982 Merge "Revert "access system resources with android.R package"" am: 6bd382b85f am: 4644c7f0a6
Change-Id: I0047f705a655132901b4cdaefc65e780c39b1f4f
2020-04-06 20:32:55 +00:00
Daniel Bright
4644c7f0a6 Merge "Revert "access system resources with android.R package"" am: 6bd382b85f
Change-Id: Icb0a0cdcb759baf30ef97eb418a3fa73642587f9
2020-04-06 20:12:47 +00:00
Daniel Bright
6bd382b85f Merge "Revert "access system resources with android.R package"" 2020-04-06 19:49:55 +00:00
Pingzhi Wang
63c3b9a6cd Button text for app space management is overwritten
Apps that have implemented a managed space activity
gets the wrong label in Settings../App info/"Storage & cache"

Test: manual
Bug: 111674319
Change-Id: I1f7cccf0558960f867a8bf2d0ee14dc5ec9fd7a9
2020-04-06 21:00:54 +02:00
Peter Wang
9f984b5d03 Hide unprovisioned MDN (phone number) at select profile dialog
Bug: 151773922
Test: Build & Device
Change-Id: If84600cc426fefcdd219c4a44a5510b8db5c0a89
Merged-In: If84600cc426fefcdd219c4a44a5510b8db5c0a89
2020-04-06 10:50:11 -07:00
Lorenzo Colitti
6d63161ae8 Merge "Add Ethernet Tethering settings" am: 526741a2f2 am: 2b54956856
Change-Id: I2376506bc55e1e0f7b3e3b9da3a86c565fc279c9
2020-04-06 15:49:45 +00:00
Lorenzo Colitti
2b54956856 Merge "Add Ethernet Tethering settings" am: 526741a2f2
Change-Id: I475283b47906ae6fa2fba6fd4ddb506a266c398c
2020-04-06 15:28:41 +00:00
Lorenzo Colitti
526741a2f2 Merge "Add Ethernet Tethering settings" 2020-04-06 15:11:31 +00:00
Treehugger Robot
e49792af4f Merge "Usb preference title changed when rotating" am: fb2690102b am: b2c2d6e968
Change-Id: Iee22552157539be1774faf741a3b191371318326
2020-04-06 14:17:30 +00:00
Bonian Chen
1b36fda316 [Settings] mSubId should not be overridden in TelephonyBasePreferenceController
mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.

Bug: 150535296
Test: manual
Merged-In: I391b034c9badd43094ab52b8b6488bca07ef3c86
Change-Id: I65fda30d1e699695315eb57d8930a27fdebb5a46
2020-04-06 22:01:13 +08:00
Treehugger Robot
b2c2d6e968 Merge "Usb preference title changed when rotating" am: fb2690102b
Change-Id: Iba767119b8b098ba4aa38beda885775edf35274f
2020-04-06 13:55:01 +00:00
Bonian Chen
5ab1c6cb61 [Settings] Changes for supporting replacing ImsManager
Wrap IMS related APIs in order to support replacing ImsManager.

Bug: 140542283
Test: build pass
Merged-In: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
Change-Id: Ibc8c1c36fe031a3d845b99f878ef45ce5db7de28
2020-04-06 21:43:05 +08:00
Treehugger Robot
fb2690102b Merge "Usb preference title changed when rotating" 2020-04-06 13:39:56 +00:00
TreeHugger Robot
d0cfaf2a05 Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev am: 9643b9c727
Change-Id: I075de401b8e30987d5a4c680ff6e51b9e4d16141
2020-04-06 04:07:21 +00:00
TreeHugger Robot
9643b9c727 Merge "Hide unprovisioned MDN (phone number) at select profile dialog" into qt-qpr1-dev 2020-04-06 03:49:07 +00:00
Bill Yi
f9db1c467e [automerger skipped] Import translations. DO NOT MERGE am: 9f8e7a90d8 -s ours
am skip reason: subject contains skip directive

Change-Id: I532a0e2ecfe2374f68ab43d7facf6499aaa774b0
2020-04-04 06:57:04 +00:00
Bill Yi
9f8e7a90d8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Iced480939d3fa27302bdbe2a6701220c61e9511f
2020-04-03 21:52:12 -07:00
Peter Wang
6758ca661e Hide unprovisioned MDN (phone number) at select profile dialog
Bug: 151773922
Fix: 151773922
Test: Build
Change-Id: If84600cc426fefcdd219c4a44a5510b8db5c0a89
Merged-In: If84600cc426fefcdd219c4a44a5510b8db5c0a89
2020-04-03 00:09:39 -07:00
TreeHugger Robot
f08a34384c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours
am skip reason: subject contains skip directive

Change-Id: I5373ee983698aac693473cbc8322a125e1a46fe5
2020-04-02 04:42:41 +00:00
Bill Yi
2d3fa30802 [automerger skipped] Import translations. DO NOT MERGE am: f639851869 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf7772c7f1a9dda8719e2d8b63e7d381d491255b
2020-04-02 04:42:34 +00:00
TreeHugger Robot
dd6e85b216 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-04-02 04:24:36 +00:00
Bill Yi
e6b95c40b4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ice5352ce325a55055947f2763bf3d2018c7f0d90
2020-04-01 20:06:38 -07:00