Commit Graph

28236 Commits

Author SHA1 Message Date
Bonian Chen
14b0af4343 Merge "[Settings] Refactor for performance" 2020-08-03 08:33:30 +00:00
Bonian Chen
35be6641af Merge "[Settings] Allow talkback to focus and select APN" 2020-08-03 05:25:43 +00:00
Bonian Chen
ec42c98e8b Merge "[Settings] Learn more link should be removed when not supported." 2020-08-03 05:25:20 +00:00
Bonian Chen
570d5441d3 [Settings] Refactor for performance
Refactor DataDuringCallsPreferenceController in order to reduce the time
spend on constuct and initialize DataDuringCallsPreferenceController.

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest
Merged-In: I484cafa739f9e6e58427894712f2bb7e2ed1f4ff
Change-Id: Id4947606a4919f06ae5ed6ddedd02399a2ee930f
2020-08-02 22:44:11 +08:00
Bonian Chen
5331b6589b [Settings] Allow talkback to focus and select APN
Change the focus area to help talkback focus on APN items.

Bug: 149794675
Test: manual
Merged-In: I5f391be89a5b22095d6f0d04b187ea18970f18d4
Change-Id: I6d2d1624c5946a30b59343de06de6f79adf24011
2020-08-02 21:36:49 +08:00
Bonian Chen
fed54f7dc4 [Settings] Learn more link should be removed when not supported.
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.

Bug: 159510116
Test: manual
Merged-In: I36b74b2b4586546090fb88562e8f4f052a877709
Change-Id: If7061e0be201b2f98964a7b0eec42cc17cb11ae3
2020-08-02 21:14:25 +08:00
Raff Tsai
53cbfe28bb Hide sliceView if Slice is null
Fixes: 142035673
Test: robolectric, visual
Change-Id: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
Merged-In: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
2020-08-02 12:26:10 +00:00
Treehugger Robot
7df1fb2af1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 07:47:02 +00:00
Curtis Belmonte
bd8f120e95 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I89dbc737c62a796d3622cf17437f9eac930c99b3
2020-07-28 20:12:49 +00:00
Curtis Belmonte
1aa03da058 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: I25b5f8a2d87d8754e6536d24f986ab90a2bc69fe
Test: Presubmit
Bug: 161896447
2020-07-28 20:08:17 +00:00
Treehugger Robot
ed7662f6f6 Merge "BluetoothPairingRequest: Add null check for action" 2020-07-28 18:51:00 +00:00
Alan Stokes
cd2c453cbd More inclusive language.
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
2020-07-27 18:21:56 +01:00
Chen Chen
fc7b6693ee BluetoothPairingRequest: Add null check for action
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
Merged-In: I24668e20accf96c7469c9e1ab589b1383ab59d18
(cherry picked from commit 1805f666e7)
2020-07-24 14:54:35 -07:00
Treehugger Robot
d6ac86d602 Merge "Remove "storage type" preference from Settings" 2020-07-22 08:34:56 +00:00
Zoey Chen
c33f162fc9 Improve the performance of displaying preference - multithread.
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 161691402
Change-Id: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
Merged-In: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
2020-07-22 13:17:43 +08:00
joffenberg
43ee102921 Remove "storage type" preference from Settings
Since storage type is mandated as hardware-backed, this preference is no longer meaningful.

Bug: 160225361
Test: atest SettingsRoboTests
Change-Id: I9b6c1d6afdd3563201b1e85673acf4d8cb81c0a1
2020-07-21 17:18:47 +02:00
Treehugger Robot
4615179fc5 Merge "Fix mvno data field summary not update issue" 2020-07-21 06:44:08 +00:00
Treehugger Robot
46a50b35be Merge "Remove NR NSA from voice network type" 2020-07-17 17:57:43 +00:00
Eran Messeri
f37c8cb4f7 [DO NOT MERGE] Rollup Cert-related changes from R
This change includes the following commits from internal R branch
which are related to certificate management:

0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings

Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
2020-07-15 15:12:06 +01:00
Wei Huang
012c5858c9 Fix mvno data field summary not update issue
With current code logic, whenever user changing
mvno type, it only updates mvno data field text,
but the summary is not get updated.
For example, there is an apn configured as mvno
type 'GID' and mvno data 'FF', and user changes
mvno type to:
1. 'none' then save, the APN is saved with mvno
   type 'none' and mvno data 'FF' while it is
   better to save mvno data as empty value.
2. 'imsi', although the APN can be saved with mvno
   type 'imsi' and mvno data 'mcc + mnc + x',
   the UI still display mvno data field as 'FF'
   unchanged(until user edit mvno data then save)
   while the mvno data text is already changed to
   'mcc + mnc + x'. It is better to also update
   mvno data summary as 'mcc + mnc + x'

With current patch, either adding new apn or edit
exist apn, the mvno data field summary is always
consistent with latest mvno data field text, which
won't make user feel confused.

Test: Build and manual test on device.
Change-Id: Ica72e246296c20a6d20283b315e6e6c46e80ac08
Signed-off-by: Wei Huang <hwbest.v@gmail.com>
Signed-off-by: Honggang Luo <luo.loky@gmail.com>
Signed-off-by: Chao Yuan <chaoyuanx@gmail.com>
2020-07-04 04:11:52 +08:00
vichang
268371c44e Merge "Move libcore.timezone to the i18n module - Final part" 2020-07-02 10:25:54 +00:00
Victor Chang
b07e53c1c8 Move libcore.timezone to the i18n module - Final part
Bug: 141747409
Test: atest CtsLibcoreTestCases  CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
2020-06-30 14:35:09 +01:00
Treehugger Robot
b1cea4f1bc Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" 2020-06-29 14:14:47 +00:00
LuK1337
ad243904db Settings: Fix fallback summary for power_button_instantly_locks preference
* Using summary_placeholder instead of summary_empty
  leaves an ugly empty space.

Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
Sarah Chin
1017caf120 Remove NR NSA from voice network type
Since voice calls on NR NSA use LTE, the voice network type
should not be updated to be NR NSA.

Test: manual testing
Bug: 159382203
Change-Id: I77d92fab0020da356ae43293016237be7494c1e2
Merged-In: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-24 00:40:40 -07:00
Sarah Chin
de62ae7ff4 Add logic for 5G icon to SIM status dialog
Test: manual test with fake 5G data network type
Bug: 156815536
Change-Id: I764f4ade8032511b44098e7eccb19b909fccc717
Merged-In: I764f4ade8032511b44098e7eccb19b909fccc717
2020-06-23 15:32:07 -07:00
markchien
6d2c010891 Get entitlement configuration from intent extra
Tethering resource configuration is move from framwork to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
    --> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
    --> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
    --> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID

Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently. Will replace hard code
string as tethering module-lib APIs in b/159085857.

Also move the entitlement response intent registeration from onCreated
to onStartCommand, this can avoid wrong intent registeration if subId
changed between onCreate and when the intent arrived.

Bug: 146918263
Test: atest TetherServiceTest
      atest TetherProvisioningActivityTest

Change-Id: I3d06df01302a9c1f0893712d9250fe394dc66588
Merged-In: I3d06df01302a9c1f0893712d9250fe394dc66588
2020-06-19 23:21:17 +08:00
markchien
e48a3d7a76 Remove isProvisioningNeededButUnavailable usage
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only. TetherUtil#isProvisioningNeeded and
isProvisioningNeededButUnavailable are no longer needed because
tethering would ensure entitlement app is valid if entitlement check is
needed. Otherwise, tethering would return not supported that tethering
settings would be hidden.

Bug: 146918263
Test: m
Change-Id: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
Merged-In: If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c
2020-06-19 23:16:30 +08:00
markchien
dfd8d235a1 Replace ConnectivityManager as TetheringManager
Tethering APIs are all move to TetheringManager from Android R.
1. Replace ConnectivityManager tethering API usage as TetheringManager.
2. Use TetheringManager#stopTethering to disable usb tethering instead
of using deprecated ConnectivityService#setUsbTethering
3. Use TetheringManager#stopTethering to disable bluetooth tethering
instead of directly use BluetoothPan#setBlueoothTethering. So bluetooth
getProfileProxy is not needed in TetherService because tethering would
do that when calling #stopTethering.
4. Also support TETHERING_ETHERNET entitlement check that
TETHERING_ETHERNET is new added from Android R.

Bug: 146918263
Test: atest TetherServiceTest
Change-Id: Id969f29d7210f2ee32719c76439049bbc86cd4f6
Merged-In: Id969f29d7210f2ee32719c76439049bbc86cd4f6
2020-06-19 23:05:27 +08:00
markchien
500ce1d4c8 Remove schedule recheck logic from TetherService
This change just remove unused code.
Tethering no longer ask TetherService to schedule recheck
(use #EXTRA_SET_ALARM) from Android Q. Intead Tethering
(EntitlementManager) would schedule the recheck by itself.

This change is necessary in order to move the resourcesout
of the framework because TetherService needs to know when
it need to re-run entitlement recheck from framework res
(config_mobile_hotspot_provision_check_period).

Bug: 146918263
Test: atest TetherSerivceTest
Change-Id: Ie45859c19b96d0689c45dd610501fae0506742ff
Merged-In: Ie45859c19b96d0689c45dd610501fae0506742ff
2020-06-19 23:04:43 +08:00
Paul Hu
cbebca9881 Merge "Forward the ResultReceiver to Tethering Entitlement app" am: 6045e9b90d
Change-Id: I614914b738e3af198fe21b881d2e475e2e8eda41
2020-05-29 21:26:52 +00:00
Paul Hu
6045e9b90d Merge "Forward the ResultReceiver to Tethering Entitlement app" 2020-05-29 11:54:20 +00:00
paulhu
a788a3190c Forward the ResultReceiver to Tethering Entitlement app
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
Merged-In: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-29 00:06:52 +08:00
Edgar Wang
4d93ad694b Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207
Change-Id: I74e93eca610194d7251c596bb854446bbc3dc129
2020-05-28 06:45:04 +00:00
Edgar Wang
9bc3b6a207 Merge "Fix NPE if default supervisor is not defined" 2020-05-28 06:30:46 +00:00
Treehugger Robot
6ea2228e31 Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
2020-05-27 01:52:00 +00:00
Brad Ebinger
525a07ec7f Fix NPE if CarrierConfigManager is not available
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
2020-05-26 15:50:41 -07:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
2020-05-20 19:50:57 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1"
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
2020-05-20 19:14:57 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
daf6c9e85b [Settings] Remove mobile network v1
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90

Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
2020-05-20 07:49:33 +00:00
Treehugger Robot
d71f2b3f1a Merge "Preserve icon for "manage space"" am: c39b3dfd76
Change-Id: Ic24c59d88117a9e0a6f61e2c1b0e2726a1546487
2020-05-19 11:58:13 +00:00
Treehugger Robot
c39b3dfd76 Merge "Preserve icon for "manage space"" 2020-05-19 11:42:46 +00:00
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