Commit Graph

57 Commits

Author SHA1 Message Date
Kangping Dong
830d4c0b1e Merge "[Thread] add Thread toggle in settings" into main am: 522e193947 am: abd5f23fe9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2909326

Change-Id: If086f510fe5d3b3f67b4f168f2e0d3f5e0ef98bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 18:25:13 +00:00
Kangping Dong
abd5f23fe9 Merge "[Thread] add Thread toggle in settings" into main am: 522e193947
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2909326

Change-Id: I8640f2cf4a90203972a5db703ebb3e027224c746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 17:43:51 +00:00
Kangping Dong
5fc01ddd6e [Thread] add Thread toggle in settings
Allows a user to disable or enable Thread network / radio from
settings.

In this commit, a toggle is added to Settings > Connected devices >
Connection preferences to control Thread state. See the screenshots
below:
1. Thread is on: https://screenshot.googleplex.com/7FqqbzRX6rGwvSb
2. Thread is off: https://screenshot.googleplex.com/AmfRAhzuukULAAG
3. Thread is disabled by airplane mode: https://screenshot.googleplex.com/7zcesyomrveCqFE
4. Thread is searchable: https://screenshot.googleplex.com/9yFL2jeSuEhJwrS

Requirements:
1. the in-take bug: b/327098435
2. See the screenshot above
3. Test with `atest SettingsUnitTests` and manual tests
4. +2 from Yuwen
5. Flagged by "com.android.net.thread.platform.flags.Flags.thread_enabled_platform"
6. It doesn't need B&R, no preferences are added (the state is in
   Android framework (mainline module))
7. Confirmed searchable
8. Code written in Kotlin

Bug: 296990038
Bug: 319077562
Test: atest SettingsUnitTests
Change-Id: Ifa2264b8e59a5112290fd0224cb75ad228732077
2024-02-29 18:05:49 +08:00
Yiyi Shen
dd7626f55b [Audiosharing] Clean up audio sharing from Settings
Bug: 324023639
Test: atest
Change-Id: Ie73790442f39af60b125bbd48182a700bb0b290a
2024-02-26 17:24:53 +08:00
Yiyi Shen
5e8720434b [Audiosharing] UI refinement.
1. Add top summary for Audio sharing page.
2. Move Audio sharing entrance to the second place on Connection
   preferences page.
3. Make Audio sharing page searchable.
4. Add On/Off summary to Audio sharing preference on Connection
   preference page.

Test: atest
Bug: 305620450
Change-Id: I00019e53563afc0a539934fbdfa949c3401e78b9
2024-01-29 19:03:59 +08:00
Ante
bae621967e RestrictedSwitchPreference edit
Modify SwitchPreference to RestrictedSwitchPreference in order to show
to correct UWB and NFC state on UWB AE disabled.

Bug: 239714441
Test: TBA
Change-Id: I7a018547d89b644781c682bfdef48efac9b24bf9
2024-01-04 21:32:50 +00:00
Roshan Pius
ad565c49dc settings(nfc): Remove NFC beam settings
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Merged-In: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
2023-10-30 19:42:47 +00:00
Roshan Pius
21c3bca13f settings(nfc): Remove NFC beam settings
This API was already deprecated and not supported for a few years. The
API was completely removed in Android U (see b/236980291).

Bug: 307352220
Test: Verified NFC settings works correctly
Change-Id: I40974a26d170cf3eeec18e6a07a21f6c420eca9e
2023-10-27 13:26:07 -07:00
Chaohui Wang
70c4dcd507 Migrate xml to SwitchPreferenceCompat
Bug: 285231003
Test: manual - on affected pages
Change-Id: I83283fcc4b241596a8f0cdf5299417bce2810d0c
2023-10-25 14:22:20 +08:00
Yiyi Shen
4410df7f42 [Audiosharing] Add audio sharing settings with the main switch.
Flagged with enable_le_audio_sharing

Bug: 305620450
Test: Manual
Change-Id: I9ca520014d3f6f7147bb9b8e7648797e79b46f53
2023-10-24 16:12:13 +08:00
Xin Li
6b3d512b63 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Change-Id: I4ed5b2e4c6c59527bb544e8b6dff2b9d4cee9025
2023-08-25 13:50:56 -07:00
Roshan Pius
4e4877916d Implement DISALLOW_NFC AE user restriction
Bug: 271452372
Test: Compiles
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
2023-08-24 20:39:23 +00:00
Roshan Pius
f72a53a595 Implement DISALLOW_NFC AE user restriction
Bug: 271452372
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:07c1baaaf6ee683779b5215f91d25a0ad7e4b749)
Merged-In: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
Change-Id: I8ef4b7a3630535bde9eedb4da78ae3fee8e13234
2023-08-23 18:36:40 +00:00
Xinyi Zhou
dd5a7d27f0 Revert "Revert "Delete Fast Pair Settings""
This reverts commit 6db89c73d6.

Reason for revert: the feature is no longer needed

Test: -m
Change-Id: I3c8b3af68cb2b6e8ad1690cab1a5bbf3c92b2481
2023-02-02 15:22:47 -08:00
Ante
9bda0e1eb4 Implement DISALLOW_UWB AE user restriction
Bug: 239714441
Test: m; manual test with testDPC;
Change-Id: Ib78e03ab82592361898f797d82bcf3d6f76f577b
2022-10-26 19:40:58 +00:00
Xinyi Zhou
6db89c73d6 Revert "Delete Fast Pair Settings"
This reverts commit 3438e20da1.

Reason for revert: Fast Pair Project is resumed

Test: loaded on device
Change-Id: I54f68794be9c527c5c873e301aada51bcdb6e298
2022-08-03 22:07:07 -07:00
Xinyi Zhou
3438e20da1 Delete Fast Pair Settings
Fast Pair will not be launched in T.

Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
2022-04-27 12:29:59 -07:00
Xinyi Zhou
7871ccff33 Add Fast Pair to System Settings
Test: manual - took a screen capture https://photos.app.goo.gl/YgkVkAqxib4DwFs49 unit tests passed.
Bug: 203579197

Change-Id: Ie15ede111f7cdd1fc635fb9c475fe210d3f7f91b
2022-01-13 23:26:35 -08:00
Chienyuan
1b9a21ffb5 RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
(cherry picked from commit 5be9255ddf)
2021-10-14 08:47:16 +00:00
Chienyuan
5be9255ddf Remove connection preferences "Files received via Bluetooth"
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
2021-10-09 01:19:00 +08:00
Joy Babafemi
63976c2051 Revert "Revert "UWB: Re-enable UWB toggle""
This reverts commit 2e593b3784.

Reason for revert: Root cause b/196317865 fixed

Bug: 197519749
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
Merged-In: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
2021-08-26 20:27:23 +00:00
Joy Babafemi
25b81a2640 Revert "Revert "UWB: Re-enable UWB toggle""
This reverts commit 2e593b3784.

Reason for revert: Root cause b/196317865 fixed

Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
2021-08-25 03:58:53 +00:00
Roshan Pius
2e593b3784 Revert "UWB: Re-enable UWB toggle"
This reverts commit 7437b1f07e.

Reason for revert: Reverting until root cause of b/196317865 is identified.

Bug: b/196317865
Test: Compiles
Change-Id: I6dfed998c4387a54dac8d41ed65c5a30752ed290
2021-08-12 17:05:18 +00:00
Joy Babafemi
7437b1f07e UWB: Re-enable UWB toggle
Re-enabling only in master branch

Bug: 194945173
Test: manual
Change-Id: I399b6b262a80870f3f4014f3b66021b740518abd
2021-07-29 03:39:52 +00:00
Joy Babafemi
60758f3eb6 Remove UWB Toggle temporarily.
Test: Manual
Bug: 192499944
Change-Id: I48b8190d9e10d95f261bb13b92c899093283bfac
2021-07-01 00:47:14 +00:00
Joy Babafemi
a5672945ae Add UWB Settings
Screenshot 1: https://screenshot.googleplex.com/5wjKkioeehZnz74
Screenshot 2: https://screenshot.googleplex.com/AtaufsUgLgVk2Ur

Test: Robotest
Bug: 183254940
Change-Id: Ibd2e3f3ad9596dddbdd23d7f2ad5e03768648faf
2021-04-22 06:16:35 +00:00
Tsung-Mao Fang
6b73e0fc97 Add keywords for a few settings
Test: Rebuilt apk, and see the results in settings search.
Fix: 157978733
Change-Id: Ib02adf8b3fd11b619246a2bd050801b9fa5ec7d3
2020-06-04 17:16:23 +08:00
Edgar Wang
71099e7a54 Remove duplicated index search data
Bug: 143055215
Test: manual & robotest
Change-Id: I82583efe37c44014b8949a40d7a695461a7382a9
2020-03-10 19:47:40 +08:00
Edgar Wang
7312defa4a Fix Wifi & Bluetooth slice can't show on search result
root cause: we remove wifi & bluetooth preference screen key from search
indexing, this cause these 2 special slices can't map to correct key

solution: rename preference key for mapping

Bug: 149366072
Test: robotest & manual
Change-Id: Id424e63c4f97ccd6f58a80aaa414807774159512
2020-02-12 17:07:34 +08:00
Edgar Wang
0934babbfc Make the fragment title can’t searchable
we shouldn't take users so deep into the settings IA because it's easy
to feel lost in settings after clicking on a result without additional
context.

Bug: 143055215
Test: robotest & manual
Change-Id: I337cb5ead31e1e4e7bf9be78132e90630f83ee43
2020-02-06 19:07:11 +08:00
robertluo
81c79bb239 Merge Tap & Pay settings entries with NFC
Bug: 142231537
Test: make -j42 RunSettingsRoboTests
Change-Id: I54ea0cdf711f2c381f5bba8575fc22bd6329f3c6
2020-02-06 12:15:39 +08:00
Raff Tsai
6db277ebb7 Remove summary provider
- use SummaryProvider to provide the summary of UserSettings
- use WifiDisplayPreferenceController to replace the summary loader
in WifiDisplaySettings
- use ConfigureNotificationPreferernceController to replace the
sumary load in ConfigureNotificationSettings

Fixes: 141653158
Test: robolectric
Change-Id: Id5f5ed645707caa0b25ecae5252174cbf017651c
2019-10-03 15:04:36 +08:00
Ruchi Kandoi
dd9b61278b Merge "Add Secure NFC functionality" 2019-01-30 18:58:50 +00:00
Ruchi Kandoi
5bf4e1ec4f Add Secure NFC functionality
Secure NFC will permit NFC acitvity only when screen
is unlocked.

Bug: 117253725
Test: Manual; Toggle switch; check if HCE works with screen off
Change-Id: I9977d85065fc7ebca3ed4991ffa52fef0590cf90
2019-01-29 16:33:46 -08:00
Amin Shaikh
9391361438 Move SettingsLib icons to android.
Bug: 122263617
Test: make
Change-Id: Ia2ab06561824656951fbd0019e9c921442c714e1
2019-01-28 13:46:54 -05:00
Fan Zhang
018fe5adf5 Clean up bluetooth while driving code.
Test: robotests
Change-Id: I50aedc61a9a7836672e934e188837dbe49c64be2
2018-11-07 15:52:18 -08:00
Fan Zhang
9ce4a1fcde Use searchable="false" to suppress nonIndexables.
When possible, remove or simplify getNonIndexable() logic in fragments,
and use searchable="false" in xml to suppress index.

Change-Id: I5bdf5bc7d5494a64cdd9e230a51321a4b210af69
Fixes: 112608186
Test: robotest and manual search
2018-08-17 09:21:05 -07:00
hughchen
68b9bb68c5 Change the string
Change name of "Received files" to "Files received via Bluetooth"

Bug: 78247635
Test: make -j42 RunSettingsRoboTests
Change-Id: I63cb7a5179008380a70929102bcd9eba38b07387
2018-06-06 14:28:05 +08:00
Chihhang Chuang
3b387a028a Refactor nfc preference controller
- Remove BaseNfcPreferenceController.
- NfcPreferenceController inherit from TogglePreferenceController.
- AndroidBeamPreferenceController inherit from BasePreferenceController.
- Override getIntentFilter in NfcPreferenceController to listen changes.
- Add an API (hasAsyncUpdate) into BasePreferenceController to
distinguish the setting which is updated asynchronously.

Change-Id: I7c9c48ea7f1ad01a02524beabf9d30baa3db891f
Fixes: 67997761
Fixes: 74887543
Test: RunSettingsRoboTests
2018-05-23 13:58:28 +08:00
hughchen
4bf7c3a921 Bluetooth and NFC added back to Connection preferences
* For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in
  master and fix TreeHugger "Automatic merge failed" error.
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90
2018-05-16 08:03:00 +00:00
HJ ChangLiao
b247311b2a Move BT, NFC out of Conntection pref
Move BT, NFC preference out of Connection Preference,
To Connected devices page.
Because NFC and Android Beam are controlled by the same controller,
Create each controller for those preference and leave the sharing part.

Change-Id: I8bc303a5f487de9c667487119b49e1e4130aa80c
Fixes: 72458929
Test: manually test, make RunSettingsRoboTests
2018-03-28 09:55:22 +08:00
Antoan Angelov
84a4dd0bde Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev 2018-03-23 14:10:29 +00:00
Lei Yu
687964cf28 Add search index provider for bt page
1. Implement the search index provider for
ConnectedDeviceDashboardFragment.
2. Since in SEARCH_INDEX_DATA_PROVIDER fragment is null,
so we need to pass in context to all components
instead of getting it from fragment.
3. Update test for it as well as creating new shadow.

Change-Id: If0aa67d5b6ca207c6b728c8355581bf414577091
Fixes: 69333961
Test: RunSettingsRoboTests
2018-03-21 10:46:02 -07:00
arangelov
75c603cedb Show policy transparency popup dialog for Bluetooth in Settings.
Bug: 70206452
Test: make ROBOTEST_FILTER=BluetoothEnablerTest -j40 RunSettingsRobotests
Test: make ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest -j40 RunSettingsRobotests
Change-Id: I543cf69b754c44b02c66e101698f10906a1b957f
2018-03-21 16:03:28 +00:00
Matthew Fritze
a4a3dfffa2 Declare official platform slice
Create the notion of an official platform slice.
This includes:
- Adding a second authority to the provider
- tagging slices in xml with a platform slice flag
- Including authority in the getUri method

Bug:73359139
Test: robotests
Change-Id: I5382be138a262dbc5a8324c34aab131c5d0d5516
Merged-In: I581ee6dfcdf935f452a15e89e5d055e375ff1877
2018-03-09 18:04:06 +00:00
Vladislav Kuzkokov
5b1faf1bfc Add policy disclosure for printing.
Bug: 64140119
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib453c492f1dc9e6f9bd4019104dfd3eafcd0a8b4
2018-02-21 17:19:50 +01:00
Fan Zhang
2edbaa7062 Change print setting from a dynamic tile to static pref
...because dynamic tile is a lot harder to index correctly.

- Removed metadata that makes PrintSettings a dynamic tile.
- Added PrintSettings into connected_device xml.
- Added a new PreferenceController - all summary updating logic is
  copied from PrintSettingsFragment

Change-Id: I41e7c9d23e97ecd5a043ac7c33f2d404260c92e7
Fixes: 73128944
Test: robotests
2018-02-12 15:19:43 -08:00
Leslie Watkins
58eb43a2e4 Remove all reference to SmsMirroring in Android Settings.
Test: Robotests

Change-Id: I3318c6915cae95522f09838f00a3c567fe9e5fc5
2018-02-12 22:05:56 +00:00
Matthew Fritze
700c113218 Add Toggle Controllers to XML
Autobrightness preference controller was accidentally removed from
display_settings.xml. Given that no tests were broken and this would
be a disaster for phone buddy & inline actions, I have added another
test which keeps a list of valid controllers that should exist in xml.

When more inline controllers types are added, they will be included
in this test.

Fixes: 72564979
Test: robotests
Change-Id: I40fe18f9118af9cec1c201632742d2949ff64be5
2018-02-07 17:09:05 -08:00
Jerry Zhang
d18d6f1022 Add new USB details screen for Connected Devices 2.0
Also updated UsbBackend to use the new UsbFunctions
api.

Added new unit tests for UsbDetailsHeaderController
and UsbDetailsProfilesController.

Bug: 69333961
Test: make RunSettingsRoboTests
Change-Id: I133750190bb61dfe0e20b06f50e50ea13b347f1e
2018-01-31 11:23:08 -08:00