TreeHugger Robot
9883578f80
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f25d55b33f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246827
Change-Id: Iec679af0f35dc4ac39fd6e3c6fb2eb7496cf51a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:00:43 +00:00
Bill Yi
fb4c4d64a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99adb84106
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246827
Change-Id: I30b195f036e43e15c9a90ffe4b25c22075595366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:00:08 +00:00
Chaohui Wang
a8e19e0f2c
Add DefaultAppShortcuts for Spa
...
Including the following,
- Home app
- Browser app
- Phone app
- Emergency app
- SMS app
Bug: 236346018
Test: Manual with App Info page
Test: Settings Unit tests
Change-Id: I4ceb31ed521b758a6f91d7e86fd34c780442b1ac
2022-10-21 15:43:12 +08:00
TreeHugger Robot
f25d55b33f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-21 07:30:44 +00:00
Shen Lin
bb2fb2ffd6
Ensure search highlight position when scheduled runnable starts
...
Search highlight function includes two steps: Scroll list to target position first, then notifyItemChanged to it.
We use a Handler.postDelay to implement this. However, when scheduled runnable starts, the original target position could have changed due to preference list update, calling recyclerview's methods after that will be easy to cause an exception.
This CL ensures highlight position every time before calling recyclerView update, which also contribute to origin fix of RecyclerView IllegalArgumentException to a certain extent.
Test: atest, also test some search results, and see the correct behavior
Fixes: 246411107
Change-Id: Ifa758ce3718b047138079246cdfce99fdf66d5b2
2022-10-21 14:01:47 +08:00
Treehugger Robot
b267f66627
Merge "network: fix binder object leakage in settings" am: bdcd3a3975
am: 5408baabdd
am: 00f25b5d5f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2136792
Change-Id: I344cc9da6dfbb456c258ea96d9d9b47a5dac67d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 05:07:24 +00:00
Kuan Wang
cbaffa34bc
Add functions of SI DatabaseUtils into Settings DatabaseUtils and remove
...
unused functions.
Bug: 253395332
Test: make RunSettingsRoboTests
Change-Id: I61feee3386d7291f9174acb884d09d7ab8733511
2022-10-21 04:48:14 +00:00
Kuan Wang
c7afa45eac
Clean up unused function getHideApplicationSummary in
...
PowerUsageFeatureProvider.
Bug: 253395332
Bug: 254769892
Bug: 254769770
Test: make RunSettingsRoboTests
Change-Id: I6acf0cbdb7321934e85939e0acee567001107a17
2022-10-21 04:42:06 +00:00
Treehugger Robot
00f25b5d5f
Merge "network: fix binder object leakage in settings" am: bdcd3a3975
am: 5408baabdd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2136792
Change-Id: Ic7d0893d3c7793f000db51183cbce0ad49765805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 04:34:57 +00:00
Bill Yi
4edbcb414c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dece402e5a
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20246318
Change-Id: I674f1acd6a1dc654ac9266719ac40435db5e65e2
2022-10-21 03:59:05 +00:00
Treehugger Robot
5408baabdd
Merge "network: fix binder object leakage in settings" am: bdcd3a3975
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2136792
Change-Id: I141693097ed912ff223b3be3fa997a51b6713ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 03:52:48 +00:00
Treehugger Robot
bdcd3a3975
Merge "network: fix binder object leakage in settings"
2022-10-21 03:25:39 +00:00
Alan Huang
4a7690919c
Fix the bluetooth extra control slice not visible
...
The bluetooth extra control slice requires a parameter for the page width, but sometimes the onGlobalLayout callback is after the the fragment refresh the preference available state. Thus, setting the extra control slice to invisible, because the uri is not been set yet. So, add the displayPreference call to update the visibility of the slicePreference.
Bug: 251450477
Test: manual build and QA automation testing.
Change-Id: If7e5f426fc8b1d6887a5977600eaeaf3ede553d1
2022-10-21 03:25:35 +00:00
Milton Wu
eff9effb25
Merge "Retry fingerprint or face unlock" into tm-qpr-dev am: c1d0d230d4
am: 96f959737c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188600
Change-Id: I9c05b7bf43304fead4ae03a23a5106afe55612f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 02:12:23 +00:00
Milton Wu
96f959737c
Merge "Retry fingerprint or face unlock" into tm-qpr-dev am: c1d0d230d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188600
Change-Id: I24e093bb5dac1fcce152a85b332a19c3df5aa77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 01:41:51 +00:00
Milton Wu
c1d0d230d4
Merge "Retry fingerprint or face unlock" into tm-qpr-dev
2022-10-21 01:08:37 +00:00
Bill Yi
99adb84106
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib20c6175cf2df8ca8b58ce76b04aa32ec2951c97
2022-10-20 12:48:24 -07:00
Bill Yi
22fa29b118
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e9f3b9525cfc5adcc87f0d70bd89fa390dbe151
2022-10-20 12:44:50 -07:00
Bill Yi
dece402e5a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I814f8120bdf869f96b51ccedf7d1fa737740bb06
2022-10-20 12:38:38 -07:00
Tetiana Meronyk
9183d06d41
Merge "Show other users in storage settings"
2022-10-20 16:20:41 +00:00
TreeHugger Robot
fbf9c8fee6
Merge "Fix UwbPreferenceControllerTest"
2022-10-20 14:49:30 +00:00
Bonian Chen
2f07595eb0
[Settings] configuration for hidding SIM provider UI
...
Hide SIM provider UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
2022-10-20 11:35:28 +00:00
Bonian Chen
504e71c284
[Settings] configuration for hidding SIM notification UI
...
Hide SIM notification UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: I07d9ddeb96ca590decf28126ce97fba4c1783304
2022-10-20 10:11:11 +00:00
Bonian Chen
69f6e76f2c
[Settings] configuration for hidding SIM remove UI
...
Hide SIM remove UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
2022-10-20 09:59:01 +00:00
Weng Su
f9b5e046a8
Add config for Wi-Fi Hotspot Settings hidden
...
- Add config_show_wifi_hotspot_settings for Settings customization
- Hide Wi-Fi Hotspot preference in Hotspot & tethering Settings
- Don't launch Wi-Fi Hotspot Settings (e.g long press on Hotspot in QS-tile)
Bug: 213426762
Test: manual test
atest -c com.android.settings.wifi.WifiUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Merged-In: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
Change-Id: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
(cherry picked from commit 160b5078ed
)
2022-10-20 09:50:22 +00:00
Bonian Chen
5bcfa284a9
[Settings] configuration for hidding SIM settings UI
...
Hide SIM settings UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: If1df99a79e51125d03f534cdfc9408b01c61024f
2022-10-20 09:46:44 +00:00
Chaohui Wang
6d39e5c911
Add AppOpenByDefaultPreference for Spa
...
The "Open by Default" in App Info page.
Bug: 236346018
Test: Manual with App Info page
Test: Settings Unit tests
Change-Id: I20f827241ff46bca28440b56fd32a0712ee439f9
2022-10-20 17:28:46 +08:00
Xuanang Zhao
72503d29bd
Clean up an unused slice and classify the custom slice usage.
...
Test: maunal
Bug: 249101421
Change-Id: I362995c114f65f0105b5e2b8036ecb886bd6663a
2022-10-20 07:24:29 +00:00
TreeHugger Robot
c757a12a4e
Merge "Add config for Wi-Fi Hotspot Settings hidden"
2022-10-20 06:08:55 +00:00
shaoweishen
66098febbc
[Sound Panel] Fix bugs for sound panel slice
...
1. notify item change when slice live data has update
2. keep showing Output Switcher slice when media state is in "Pause"
state
Bug: 247043239
Bug: 238715094
Bug: 204165377
Test: verified on device
Change-Id: Ic56a70f2f2835231519e2fccf0d2e649d41b106e
2022-10-20 02:46:41 +00:00
Gil Cukierman
a2ddff3865
Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController
...
When 2g is disallowed by a device admin the 2g toggle in the preference
screen will implement the following behaviors as a result of being
changed to a RestrictedSwitchPreference:
1. become disabled (greyed out)
2. show a summary message explaining that the preference was disabled by
an admin
3 show a pop up when a user tries to click on the preference informing
them that the setting is unusable because it was disabled by an admin.
Additionally, the toggle will show as unchecked (off) when admins
disable 2g.
When 2g is re-enabled by a device admin, the preference screen will go back
to its previous state.
Test: atest Enable2gPreferenceControllerTest
Bug: b/248250240
Change-Id: I7af901f2d9f62ebfe884e01724d8eff845c2968e
2022-10-19 21:01:17 +00:00
Joy Babafemi
eb2532388b
Fix UwbPreferenceControllerTest
...
Bug: 253386238
Test: atest UwbPreferenceControllerTest
Change-Id: I32c07f3bdbf0540ec372b72be945aa07e5d29d62
2022-10-19 19:33:47 +00:00
Milton Wu
5a47cf56ef
Retry fingerprint or face unlock
...
When IllegalStateException happens during user enters `Fingerprint
Unlock` or `Face Unlock` page through `Face and Fingerprint Unlock`
page, show ConfirmLock for user to re-enter credential again.
If user fails to pass credential page, finish activity and back to
`Security` page.
If user success to pass credential page, enter `Fingerprint Unlock` or
`Face Unlock` page.
Test: Manully test timeout case on `Face and Fingerprint Unlock` page
Test: robotest for CombinedBiometricProfileSettingsTest
FaceSettingsLockscreenBypassPreferenceControllerTest
Bug: 248165760
Change-Id: I3361c38d09d14461db8ecf2d89a34ba9604dc7e8
2022-10-19 23:55:39 +08:00
Jason Huang
2bb35ff3fc
network: fix binder object leakage in settings
...
Summary:
When BT ON and enter into NetworkDashboardFragment, and turning BT OFF and exiting the fragment, the `BluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN)` will not be called.
This causes binder leakage on next time the NetworkDashboardFragment is entered, until killing Settings process.
Reproduce Steps:
1. Turn BT ON
2. Open Settings process
3. Enter "Network & internet" (NetworkDashboardFragment)
4. Turn BT OFF
5. Back to previous page (do not kill Settings process)
* Repeat Step 3-5
Solution:
Do not set value of `mBluetoothPan` to null when `onServiceDisconnected` raised, to ensure the binder object (profile proxy) be closed in lifecycle `onDestroy()`.
Bug: 243128377
Test: enter "Network & internet" page, turn off BT and leave the page
Change-Id: Ieca3e5401c23d1b0ffece1bbb0db96988044262d
2022-10-19 22:07:55 +08:00
Weng Su
160b5078ed
Add config for Wi-Fi Hotspot Settings hidden
...
- Add config_show_wifi_hotspot_settings for Settings customization
- Hide Wi-Fi Hotspot preference in Hotspot & tethering Settings
- Don't launch Wi-Fi Hotspot Settings (e.g long press on Hotspot in QS-tile)
Bug: 213426762
Test: manual test
atest -c com.android.settings.wifi.WifiUtilsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25
2022-10-19 20:13:21 +08:00
Chaohui Wang
402744eb36
Add AppButtonRepositoryTest
...
Bug: 236346018
Test: Unit test
Change-Id: I174bad92ef5357ba0ea0e32cb0435d700a11dc51
2022-10-19 19:55:01 +08:00
Chaohui Wang
cb7fa280f3
Merge "Make the default getTimeSpentInApp() return empty"
2022-10-19 11:50:48 +00:00
Tetiana Meronyk
5c0bb75de8
Show other users in storage settings
...
Bug: 232969364
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.deviceinfo.storage.NonCurrentUserControllerTest"
Change-Id: I8d933bec8f12faa971684939b722cfae957f4953
2022-10-19 10:44:06 +00:00
Simon Wingrove
c359630286
Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev am: 062b18c736
am: cf14410f5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209765
Change-Id: I457654172b46fff1b1059a8058894caad3021e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 09:50:59 +00:00
Bonian Chen
99698c344c
Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1
am: 5f5bcf56ca
am: 6b6287111f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204
Change-Id: I65b87ec068d0b5ce0948937604f71ccb4ba6e6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 09:50:23 +00:00
Simon Wingrove
cf14410f5c
Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev am: 062b18c736
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209765
Change-Id: Ie86adb15224dc9052d6b017959b78114bbcb6a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 09:17:47 +00:00
Bonian Chen
6b6287111f
Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1
am: 5f5bcf56ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204
Change-Id: I9bcb0366eee69b9345b6dbd6209d627fe67c31f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 09:16:42 +00:00
Bonian Chen
5f5bcf56ca
Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204
Change-Id: Icece91f8119388bbf7bca7129b9f077bc0c857a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 08:32:33 +00:00
Simon Wingrove
062b18c736
Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev
2022-10-19 08:32:10 +00:00
Bonian Chen
90dcc7c5c1
Merge "[Settings] align the long press behavior on secondary sim"
2022-10-19 08:01:34 +00:00
Chaohui Wang
b752c3d058
Make the default getTimeSpentInApp() return empty
...
Current ApplicationFeatureProvider.getTimeSpentInApp() defaults returns
null, in extreme case there is ACTION_APP_USAGE_SETTINGS handler on
device but getTimeSpentInApp() still returns null, may lead
AppTimeSpentPreference to crash.
Make it returns empty string instead to eliminate this extreme case.
Bug: 236346018
Test: Unit test & Manual with SpaActivity
Change-Id: I33b413ceb9bdf48e3902e02c91fab617fe297862
2022-10-19 15:57:50 +08:00
Jason Chiu
8f01270b1c
Merge "Shorten the search box hint for two-pane layout"
2022-10-19 07:54:08 +00:00
SongFerng Wang
4e151185a7
Merge "[LE unicast] Using the pairDeviceByCsip API" into tm-qpr-dev am: 3767112332
am: 29caa8e0f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176388
Change-Id: Ib1dcb8c150cb8123c5dc2475839d49f97e792c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 07:07:16 +00:00
SongFerng Wang
29caa8e0f4
Merge "[LE unicast] Using the pairDeviceByCsip API" into tm-qpr-dev am: 3767112332
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176388
Change-Id: I9e77d96cd60eff8f7feb5f257bd05979f49e345a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-19 07:04:20 +00:00
Jason Chiu
3aec52141d
Shorten the search box hint for two-pane layout
...
Change from "Search settings" to "Search".
Fix: 248006011
Test: visual
Change-Id: I76a1fa0f8c38e5438f2b01a1b6d83cae3968502c
2022-10-19 13:34:48 +08:00