Commit Graph

55977 Commits

Author SHA1 Message Date
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
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
733530e086 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b
Change-Id: If4f0e4b0c0d44ee6b7387a4a94c44d949706c557
2020-04-08 06:56:14 +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
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
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
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
d998b07a01 Merge "[Settings] Refactor TelephonyConstants" am: 9371311309
Change-Id: I58dad89c087419ff07438ba02d08cde9d0e874ca
2020-04-07 08:15:41 +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
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
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
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
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
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
Xinli Zhang
4497c4d3bf Usb preference title changed when rotating
Rotate usb preference screen from horizontal to landscape
or vice versa. USB preference screen title changes.

Bug: 152895735
Test: manual
Change-Id: Ib8493662ab68146f0b5470936a8ba97a058c2a6d
2020-04-01 10:05:48 +02:00
Sooraj Sasindran
309505a7d2 Revert "access system resources with android.R package"
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Test: make
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Merged-In: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
2020-03-31 18:18:22 -07:00
Sarah Chin
c03048cd27 Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a Merge "Rename calls to isGlobalModeEnabled" 2020-03-31 23:02:20 +00:00
Brad Ebinger
8bc35321d8 Merge changes I06df2928,I70821964 am: 24ddbf5e8c
Change-Id: I3aeb0e140fcb3a6c28e1880a6784e7800c368f47
2020-03-31 20:10:07 +00:00
Brad Ebinger
da1335a9f4 Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a
Change-Id: If7f5ed1343a5b13810455bcf7168b8b095db149c
2020-03-31 20:10:05 +00:00
Brad Ebinger
24ddbf5e8c Merge changes I06df2928,I70821964
* changes:
  Fixes ContactDiscoveryDialogFragmentTest
  Add new DialogFragment and Controller for capability discovery opt-in
2020-03-31 19:39:59 +00:00
Remi NGUYEN VAN
85f97bf02a Merge "Adjust code for API council feedback" am: aab7aca759
Change-Id: Idd49347f191f75bbe05b45fcfa47856d87c983bb
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
aab7aca759 Merge "Adjust code for API council feedback" 2020-03-30 02:58:45 +00:00
Tobias Thierer
21b01bc4f2 Merge "OWNERS: Remove tobiast." am: dffcd7a949
Change-Id: Iad09bc83fa7f258f83ee505a4cd9edf9004f542d
2020-03-27 11:30:14 +00:00
Tobias Thierer
dffcd7a949 Merge "OWNERS: Remove tobiast." 2020-03-27 11:04:12 +00:00
Yuuki Habu
8e177ae1c7 Add Ethernet Tethering settings
Add Ethernet Tethering settings
 - Show prefernce if config_ethernet_iface_regex is set
 - Activate if tethered ethernet interface is exist

Bug: 148824036
Test: manual test
 - update prefernce plug-in, plug-out
Change-Id: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
Merged-In: Ia4f365ddc1a53a926d716046db3e6ac463c978b9
2020-03-27 17:45:27 +09:00