TreeHugger Robot
521f675bea
[automerger skipped] Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev am: 87d2f6d3cb
am: dda18d1d8c
-s ours
...
am skip reason: Merged-In I11f88d0d15d6d5c2766b64b5847ac31ed0f34c25 with SHA-1 160b5078ed
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20244146
Change-Id: I110a8c6949f86bcc370d95760a5a94d0f2e6249e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-24 09:38:15 +00:00
TreeHugger Robot
dda18d1d8c
Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev am: 87d2f6d3cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20244146
Change-Id: I7b3275ffad2af79bb81c3761b691ab793a61168a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-24 03:26:46 +00:00
TreeHugger Robot
87d2f6d3cb
Merge "Add config for Wi-Fi Hotspot Settings hidden" into tm-qpr-dev
2022-10-24 03:04:59 +00:00
Bonian Chen
d9ea5b0692
Merge "[Settings] configuration for hidding SIM notification UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
6eb3f717b8
Merge "[Settings] configuration for hidding SIM lock UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
71db4e8732
Merge "[Settings] configuration for hidding SIM remove UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
210fba096f
Merge "[Settings] configuration for hidding SIM provider UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
d07157691e
Merge "[Settings] configuration for hidding SIM settings UI"
2022-10-21 13:29:18 +00:00
Bonian Chen
a4aca19f8f
Merge "[Settings] configuration for hidding SIM related UI"
2022-10-21 13:29:18 +00:00
TreeHugger Robot
98f3e24171
Merge changes from topic "tc_change_22102020_15"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dece402e5a
Import translations. DO NOT MERGE ANYWHERE
2022-10-21 13:10:24 +00:00
Chaohui Wang
fd9997f156
Merge "Add DefaultAppShortcuts for Spa"
2022-10-21 11:09:46 +00:00
Bonian Chen
7c3f04aa11
[Settings] configuration for hidding SIM lock UI
...
Hide SIM lock UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Change-Id: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
2022-10-21 10:59:11 +00:00
Julia Reynolds
1d54859168
Update category to intent action
...
Test: settings unit tests
Bug: 254339351
Change-Id: I6c4bfb474408cd9ab95ae3fbd80a89760a4b7844
2022-10-21 10:09:02 +00:00
Bonian Chen
5dae24208b
[Settings] configuration for hidding SIM related UI
...
Add overriable configuration for hidding SIM related UI.
Bug: 240515161
Test: test cases and local testing
Change-Id: I8d7ddd18861a696830da39f040dfb14b9ed46726
2022-10-21 09:21:59 +00:00
TreeHugger Robot
5702ae9f1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f25d55b33f
-s ours am: 9883578f80
-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: I3a307488f30ab902e8e9ba664dcb010064971794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:45:17 +00:00
Bill Yi
fa81d69fe6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99adb84106
-s ours am: fb4c4d64a1
-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: I9cb0ff42a1d466315dae57e9491e0e1321e327be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-21 08:44:53 +00:00
Philip Junker
638693c203
Merge "Only list apps with android.permission.TURN_SCREEN_ON."
2022-10-21 08:13:09 +00:00
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
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
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
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
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