Commit Graph

44161 Commits

Author SHA1 Message Date
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
Anvesh Renikindi
a54ecedde3 Merge changes from topic "androidx_ae"
* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.
2023-02-23 06:22:15 +00:00
Henri Chataing
b2e4e3c85f Nfc: Rename system properties in Nfc settings
The nfc properties are now added to system/libsysprop and
were renamed at the same time for homogenity.

Bug: 268219397
Test: m Settings
Change-Id: I496e128b9db225aac583a1e0b91687f78a268b63
(cherry picked from commit 94e898a02b)
2023-02-23 01:48:42 +00:00
Henri Chataing
4de9ff1a8f Merge changes from topic "nfc_logging_control"
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
2023-02-22 17:12:46 +00:00
Hieu Dang
8115b87ea3 Change API name
Change getCreateBondCaller to getPackageNameOfBondingApplication

Bug: 269604212
Test: atest BluetoothDeviceTest
Tag: #refactor
Change-Id: Ib596f94a6a718069ca9fb3a1c572ee3583f7504b
2023-02-19 15:11:42 +00:00
Jack Yu
d91e7a0565 Show reboot dialog when users disable developer options
When NFC detailed logging mechanisms are enabled and users try to
disable develoepr options, show reboot request dialog to make sure
NFC logging mechanisms are also disabled.

Bug: 204397062
Test: manual
Merged-In: I531c85fd77934ad7821c480df07465a8cd8f24f9
Change-Id: I531c85fd77934ad7821c480df07465a8cd8f24f9
(cherry picked from commit d270f29cc8)
2023-02-17 17:29:15 +00:00
Jack Yu
8f1794043c Add a new NFC developer setting option for NFC vendor verbose log
Add a new developer setting option to enable vendor verbose log.

Bug: 204397062
Test: manual
Merged-In: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
(cherry picked from commit 3d2aff896e)
2023-02-17 17:28:36 +00:00
Jack Yu
a2f8944942 Add a new NFC developer setting option for NFCSNOOP
Add a new developer setting option to enable full NFCSNOOP log.

Bug: 204397062
Test: manual
Merged-In: I3fd34500e5e7093c9d77ff737987a35f6866814e
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
(cherry picked from commit b71de640b5)
2023-02-17 17:27:38 +00:00
Jiaming Liu
b9f82bed98 Fix build for jetpack update
Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a)
2023-02-17 04:15:28 +00:00
Diego Vela
42004f3b6b Update ActivityEmbedding usage.
Update ActivityEmbedding usage.

Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
2023-02-17 12:04:26 +08:00
Treehugger Robot
dcb1dbc7f5 Merge "Make Media Vibration setting configurable" 2023-02-16 09:56:25 +00:00
David Magno
4e816be889 Make Media Vibration setting configurable
Add a configuration boolean to control whether or not to display
Media Vibration switch (default: display the switch).
This configuration can then be overriden by OEMs for devices
that don't support media vibration.

Bug: 268657239
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
        "com.android.settings.accessibility.MediaVibration"
Change-Id: I91857fbb04abc97b290559895010c3cbeef7ebab
2023-02-16 09:49:01 +01:00
Hieu Dang
e1e657dac3 Merge "Show Bluetooth dialog in a specific case" 2023-02-14 01:55:09 +00:00
Jakub Rotkiewicz
cfde422f91 Merge "SnoopLogger: Debug enhancements added settings" 2023-02-13 13:01:01 +00:00
Jakub Rotkiewicz
5a1b8a11a6 SnoopLogger: Debug enhancements added settings
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4

Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-13 11:35:55 +00:00
My Name
2e552331e9 Show Bluetooth dialog in a specific case
If the application that initiate the bonding with
BluetoothDevice#createBond is in foreground, then should dialog only
instead of showing the notification & dialog

Bug: 175931562
Tag: #refactor
Test: manual
Change-Id: I3673a0b58cbf9caabf62c951b84b49e17cfb13b8
2023-02-10 08:31:34 +00:00
Xin Li
c660135971 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
2023-02-06 21:05:31 -08:00
Patrick Rohr
d2d340146e Enable ethernet data usage when FEATURE_USB_HOST is present
Ethernet is enabled when either FEATURE_ETHERNET *or* FEATURE_USB_HOST
is present. See ConnectivityService#deviceSupportsEthernet.

ConnectivityService#deviceSupportsEthernet should really be moved to
some commonly accessible location.

Test: TH
Change-Id: I497d99169248db7e5948b3a19134ab42e66d5b9b
2023-02-03 03:32:02 +00:00
Ilya Matyukhin
67d47f6b4a Fix NullPointerException when renaming a fingerprint
(Original change made by xingbin.feng@sony.com)

Fix NullPointerException when rotating the screen while renaming
a registered fingerprint

Bug: 236873593
Test: Click a registered fingerprint to open the Rename dialog,
rotate the device and press OK. Verify that Settings does not
crash

Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b
2023-01-24 23:55:29 +00:00
Betty Chang
d7e16c22f6 Merge "[LE Audio] To add the vibrate when the scan is successful" 2023-01-13 10:34:12 +00:00
changbetty
ca475a5d37 [LE Audio] To add the vibrate when the scan is successful
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
2023-01-13 02:30:23 +00:00
Shen Lin
1721d0f276 Amend "Reset notification importance" list item style
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.

Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
2023-01-11 05:21:59 +00:00
Becca Hughes
ce5d029670 Merge "Add credential manager team to OWNERS" 2023-01-06 20:03:13 +00:00
Bill Yi
1883efae0a Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: I11c236f3901c9faaeb6c702678d330dde8f07f38
Merged-In: I3d784788884f9b80733786dc73d9bb62ffef817b

Change-Id: Iabf5075f225933cd03d2d2ac43b9821ecc9fb7c1
2023-01-06 15:26:15 +00:00
William Escande
9aa06f28e8 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" 2023-01-05 05:59:38 +00:00
Becca Hughes
71c948ce7b Add credential manager team to OWNERS
Adds Credential Manager team to owners
for where our settings UI lives (see
internal CL).

Change-Id: I0674b170c9b96e7e7dedbb5be63fa3929f292274
Test: presubmit
Bug: 253157366
2023-01-04 17:24:35 +00:00
Shen Lin
85067c8136 Fix comment typo in BluetoothLengthDeviceNameFilter
Change-Id: I222d048e683bff4473849d26de50318b51a1eb9e
Test: manual
2023-01-04 08:46:12 +00:00
Shen Lin
bdcfaceeb2 Fix NPE in BluetoothPairingController when comparing BluetoothClass
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
2023-01-03 06:33:51 +00:00
Daniel Norman
6b8778a40c Update OWNERS for A11y Settings to include myself & remove others.
Change-Id: Ia63248cfb74218a6d7f95150d379f7024f162dbb
2022-12-19 23:49:59 +00:00
Treehugger Robot
8ac09942b6 Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager" 2022-12-16 03:44:18 +00:00
changbetty
9d2b2ca5d8 Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk

Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
(cherry picked from commit c706aa6108)
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
2022-12-14 02:25:36 +00:00
Shen Lin
f677ee600a Align SETTINGS_PACKAGE_NAME reference to a single place
This CL migrated some fragmented declarations of Settings packageName.
When we want to referece package name of Settings, we prefer using
Utils#SETTINGS_PACKAGE_NAME.

Bug: 262123382
Test: make Settings -j64
Change-Id: Ice6afd993d5991bb3c50f676c637b9a5487261f7
2022-12-12 04:56:28 +00:00
Weng Su
956f288d1d Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" 2022-12-10 08:11:40 +00:00
Shen Lin
d0daff5a6d Override onTrimMemory to apply trimMemory in AppIconCacheManager
This CL adapts new trimMemory mechanism when device running moderately
low on memory.

Bug: 259630755
Test: manual
Change-Id: I6501b834ce3327f47e911600ac6fe2f09a80e54e
2022-12-09 09:45:30 +00:00
xuelin
688e61a4c6 fix WifiUtils:isNetworkLockedDown() null pointer issue
In the WifiUtils class, the isNetworkLockedDown() method does not
determine whether the context is empty, which will cause a null
pointer exception. This change adds a condition for judging the
input context as empty.

Bug:261812909
Test:make RunSettingsRoboTests
Change-Id: Ie0f17179c25a7e9d4b2f652a5667eef3cc577c7b
Signed-off-by: xuelin <xuelin@xiaomi.corp-partner.google.com>
2022-12-08 16:02:31 +08:00
Zoey Chen
8b0070a509 Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Ic4f9bb2f9fb07e9243dbb327f2ce0a41eeb9da0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 09:29:48 +00:00
Zoey Chen
a3c97876bb [Settings] Update the title if launch the fragment from search app
Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47
2022-12-07 07:18:42 +00:00
William Escande
cf36286d05 Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I1ce055ca532311ad813fdf5be80ee78e84c48d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 09:13:43 +00:00
William Escande
cd231dc047 Update log for BluetoothPairingService
ACTION_PAIRING_CANCEL does not contain an EXTRA_BOND_STATE

Test: Log change is no-op
Bug: 253775131
Change-Id: Ida67374e9369991d7e016b38df9c17a8fa5418cc
2022-12-05 15:30:51 -08:00
Tom Hsu
916110007d Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599

Change-Id: I4864b0cecaae1daebfd05a7b4f8d21adb23c31b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 07:42:10 +00:00
Tom Hsu
3b9cb9a7d9 Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" 2022-12-02 07:16:28 +00:00
Treehugger Robot
71a123db03 Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2309227

Change-Id: Ib9f5b095b2a69139ace91d319e9e649ac8948ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 00:09:36 +00:00
Treehugger Robot
4444a35bcf Merge "Only one channel is reserved for WifiP2pSettings" 2022-11-29 23:44:22 +00:00
hee.youn
dc862b46d2 [Settings] modify to use LocaleHelper on AppLocaleDetails
modify to unifying display name of locale because there is difference between summary and AppLanguageList

Bug: 260625719
Test: run Settings > General > App Language and test summary and list

Change-Id: I62b91a33632251e810d200d56d7274e216568c77
2022-11-29 14:27:55 +00:00
DingFei Song
42ee738f1b Only one channel is reserved for WifiP2pSettings
Every time we enter WifiP2pSettings, a channel will be created,
but we should keep only one channel if p2p connected.

Bug: 259364357

Change-Id: Ie3c1b1281d74332cd5df720fb13476097f3f5df9
Merged-In: I999b108bc3e3c22519398a55b503078c1069cef1
Signed-off-by: DingFei Song <v-dingfeisong@xiaomi.corp-partner.google.com>
2022-11-28 18:29:00 +00:00
Ben Murdoch
48dc0133ce Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319949

Change-Id: I7647c859fe8196e0af0e5c2871918f0940a9fe0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 12:25:02 +00:00
Bonian Chen
590abcbbf2 Revert "[Settings] configuration for hidding SIM settings UI"
This reverts commit 6477275296.

Reason for revert: Build breakage

Log: https://android-build.googleplex.com/builds/branches/aosp-main-16k-throttled/grid?head=9340544&tail=9338589

Bug: 240515161
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: Ife727bc8b8bddafb58eed0d13d5d19fd1bf0a43e
2022-11-28 11:08:25 +00:00
Bonian Chen
f7090ebbee Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319109

Change-Id: Iecaa9d4101864eaaeab0d5fc14277d39a9647682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 08:24:30 +00:00
Bonian Chen
6477275296 [Settings] configuration for hidding SIM settings UI
Hide SIM settings UI based on configuraion.

Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I13ae0909d0120039cdfe8298a6892195de2fb122
2022-11-25 22:57:50 +00:00
Bonian Chen
b644c54256 [Settings][port] configuration for hidding SIM related UI
Add overriable configuration for hidding SIM related UI.

Bug: 240515161
Test: test cases and local testing
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Merged-In: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
Change-Id: I67166b0db08635ee2bc01a8208f96126b64fd0a7
2022-11-25 13:54:35 +00:00