Commit Graph

683 Commits

Author SHA1 Message Date
Zoey Chen
6622ff7181 Merge "[Settings] Code refactor" am: f4d59078fb
Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861
2020-05-19 10:15:33 +00:00
Bonian Chen
e9911c28cf [Settings] Code refactor
Code refactor.

Bug: 141833767
Test: manual
Merged-In: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
Change-Id: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
2020-05-19 16:48:11 +08:00
Zoey Chen
2673571d28 Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca
Change-Id: I1d486a18f7b0a9b7eb79ac3d28ebbdc0cdfa88c9
2020-05-19 08:23:13 +00:00
Bonian Chen
cede995c5d [Settings] Code refactor for availability session
Code refactor for session design of availability status config.

Bug: 141833767
Test: manual
Merged-In: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
Change-Id: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
2020-05-19 11:41:59 +08:00
Zoey Chen
9cc7978d0a Merge "Improve the performance of displaying preference." am: f0322ab48e
Change-Id: I27fdfb879d8081ebd949f57799f10daa2d0f8c2d
2020-05-19 03:22:10 +00:00
Zoey Chen
ad9b5c3b56 Merge "[Settings] Avoid rendering hidden preferences" am: b4b612a8e3
Change-Id: I75cf82d73c30583c5e7983e90af50da43246abfc
2020-05-18 08:58:01 +00:00
zoey chen
20d88eb2a8 Improve the performance of displaying preference.
- Set a variable to record the status then replace getAvailabilityStatus() with it.

Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 154061428
Merged-In: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
2020-05-18 16:51:13 +08:00
Bonian Chen
cc6a88bf6c [Settings] Avoid rendering hidden preferences
Under dashboards with expand button, preferences are renderred even
not been expanded.
Avoid from rendering un-expanded preference can improve the performance
of dashboard display.

Bug: 141833767
Test: manual
Merged-In: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
Change-Id: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
2020-05-18 03:17:09 +00:00
Treehugger Robot
37c9c5b514 Merge "Revise strings as per string UX review" am: 110d7ff721
Change-Id: I523fe708d2ff6cacafec362c05e227ae5dda07c8
2020-05-06 03:23:40 +00:00
Treehugger Robot
110d7ff721 Merge "Revise strings as per string UX review" 2020-05-06 03:06:40 +00:00
Treehugger Robot
72f8fa1c90 Merge "Settings: Hide carrier settings version if empty" am: 04b1e2415c
Change-Id: I5ed35dc059aae3c9d13f9fe02f7106ca075cf112
2020-05-05 08:15:36 +00:00
Wang Han
f05b2d22fc Settings: Hide carrier settings version if empty
* This gives bad UX if empty as it stays copyable
   and "clickable".

Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
Change-Id: Ia54a1d130e77b4440753f0ce69ae1726cc2c08d9
2020-05-04 13:39:30 +02:00
Treehugger Robot
ebea74264a Merge changes I6194592d,I5a02f847 am: 44146c8e3b
Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
2020-04-30 03:17:19 +00:00
Malcolm Chen
b6fa2277f6 Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
2020-04-30 03:17:16 +00:00
Treehugger Robot
44146c8e3b Merge changes I6194592d,I5a02f847
* changes:
  Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
  Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Treehugger Robot
d6859736a4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
2020-04-29 22:50:24 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Malcolm Chen
99e64da899 Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
Bug: 152786064
Test: build and manual
Change-Id: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
Merged-In: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
2020-04-27 18:19:13 -07:00
Malcolm Chen
5e68080b1f Define a helper link for 5G limitation in DSDS footer.
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
Merged-In: I5a02f847531988217cc6ab47e3b35ed319c1027c
2020-04-27 18:14:46 -07:00
Brad Ebinger
c973423a34 Revise strings as per string UX review
Fixes: 154148793
Fixes: 155098265
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Merged-In: Ia510ce5262fbe576718b0785175c0a82acb3c722
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-27 18:00:29 -07: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
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
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
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
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
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
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
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
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
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
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
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
f469cac10a Add new DialogFragment and Controller for capability discovery opt-in
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.

Bug: 111305845
Test: manual
Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-25 16:19:54 +00:00
TreeHugger Robot
c6e000ff18 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:00 +00:00
Xin Li
0cad441364 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I2f38724f862817185ae93dd79736791540251a60
2020-03-19 10:10:41 -07:00
Bonian Chen
afbbde35b6 Merge "[Settings] Refactor of ApnSettings" 2020-03-19 16:54:42 +00:00