PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,036 Commits 1 Branch 0 Tags
ee75f546193b88f56fedbe93eaef311c0a5e82fd
Commit Graph

56036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
ee75f54619 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master 
Bug: 151763422
Change-Id: Ie99b0fb88c440f1e40a412da74905adf3f0725df
 2020-04-09 18:41:52 -07:00
Bonian Chen
ee2b1d1561 Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b am: 1dcc1037dd 
Change-Id: Ic2c8fc4e5ef11373058b9c9b3444c3c2c0c772a5
 2020-04-09 05:35:46 +00:00
Bonian Chen
1dcc1037dd Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b 
Change-Id: I532654e3c3a5650ff36963b0e2172a66ec39baa5
 2020-04-09 05:22:20 +00:00
Bonian Chen
61e003440b Merge "[Settings] Refactor of Wifi Calling part" 2020-04-09 05:04:15 +00:00
Bonian Chen
5042276cf7 [Settings] Refactor of Wifi Calling part 
Refactor of Wifi Calling to avoid accessing hidden APIs.
This includes the following cherry-picks on the corresponding files:
I455685eb26df69d929ff3ed3c26ce84aa5f6b1f8
I1a67db80b114a438afda7d45af90e54af38703c3
Idd4935a6d8ceed77c15e90f96781014d1940a427
Ia5179ee1a23f054899bc74c796542bae40cdc8d5
I57c91a095fc4d454d92e8d78e0b647b4f098c6a3
I8a09264f83b9fc4fce3f79ec3aeb6ae757b004e4
I68462368669b81e10d09bbb93e74e23ea9a1f446
I9c54eb63a0df3fde38965ee7e2ae46cc1b7efd47
I0d5dcfc33b0bddacf059d1fb9af559646e32e68a
I45977c850977be84c0dc1f6461e68a1941efc1a2
I46c047359257ddd5cb3e331add4856b01c5c9739
I35246811d3e01d0b2ca197e9a1ed7081691cd982

Bug: 140542283
Test: build pass
Change-Id: I2cddeefb7cc5f1b2060e572a73560f7cd6204d0b
 2020-04-09 01:35:07 +00:00
Treehugger Robot
56c6ff781c Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1 
Change-Id: I8edb12c3ebf05675148bbb10c35a675c00bd4570
 2020-04-08 20:03:25 +00:00
Treehugger Robot
a097d46cc1 Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e 
Change-Id: I266d033b676aebf682028a4ae01570cb1d3accd1
 2020-04-08 19:48:40 +00:00
Treehugger Robot
8889d6012e Merge "Show footer to notify user no 5G in DSDS mode." 2020-04-08 19:33:21 +00:00
Benedict Wong
c59e006104 Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad am: 3d009137d0 
Change-Id: If088e0e493884197fbc45c8006e028f7315f17a2
 2020-04-08 18:49:12 +00:00
Benedict Wong
3d009137d0 Merge "Fix VPN settings UI to validate IPsec Identifier" am: 04bfcb89ad 
Change-Id: I218940123509c1ee9864bd026a9bce721c60b41a
 2020-04-08 18:31:14 +00:00
Benedict Wong
04bfcb89ad Merge "Fix VPN settings UI to validate IPsec Identifier" 2020-04-08 18:08:19 +00:00
Bonian Chen
b3e2be170f Show footer to notify user no 5G in DSDS mode. 
(Cherry pick part of I5df95528aae12b43a15389b8048f14d9508272f3)

Bug: 151657272
Test: build pass
Change-Id: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
Merged-In: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
 2020-04-08 17:55:25 +00:00
Bonian Chen
df97bbbdd5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 
Change-Id: I5a1a3d423103971c0978e9e7dbdad216b398a159
 2020-04-08 07:11:00 +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
242b3e6d37 [automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: ad360f14a6 -s ours am: 35fb83fed6 -s ours 
am skip reason: Change-Id I1dd83ba55b34433b2b600b8a998000347b6ae5e8 with SHA-1 288fa30c2d is in history

Change-Id: I0841c4c0dd761d9dd4874679f84086ae02cf1437
 2020-04-08 06:41:17 +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 is in history

Change-Id: Ief5bbbb7c0c3a152449580dd41a6cd0ed84b8947
 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
Bonian Chen
9d1b047e4c Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd 
Change-Id: I928f1223c983a6ffcfae75cdf193779a7e688a60
 2020-04-08 05:21:31 +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
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