Commit Graph

44110 Commits

Author SHA1 Message Date
Shaowei Shen
713aa67d90 Merge "[Sound Panel] Fix bugs for sound panel slice" into tm-qpr-dev am: 02cf722b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19636172

Change-Id: Ia485be78358748e474650b76c3035d8787a3d33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-24 13:20:55 +00:00
Shaowei Shen
02cf722b24 Merge "[Sound Panel] Fix bugs for sound panel slice" into tm-qpr-dev 2022-10-24 12:43:06 +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
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
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
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
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
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
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
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
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
SongFerng Wang
3767112332 Merge "[LE unicast] Using the pairDeviceByCsip API" into tm-qpr-dev 2022-10-19 05:12:22 +00:00
Bonian Chen
7364b9bbe3 [Settings] align the long press behavior on secondary sim
Within Settings app, long press allows user to copy status/summary part
when it comes to first SIM.

This is a commit to enable the same feature on the second sim.

Test: local
Change-Id: I58d9cf9cbba213196536781d41b9ec81c0142960
2022-10-19 01:47:11 +00:00
Treehugger Robot
ab0dc7b129 Merge "Fix crash when input illegal proxy port number" am: e8160af796 am: 6372ae5e93
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620

Change-Id: Ida3089a2375e04b653058b380c2fd9f1f56a9fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 21:10:26 +00:00
Treehugger Robot
6372ae5e93 Merge "Fix crash when input illegal proxy port number" am: e8160af796
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620

Change-Id: Idc35fa976db5cfde013ec9c32191869e84c7801f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 20:42:36 +00:00
Treehugger Robot
e8160af796 Merge "Fix crash when input illegal proxy port number" 2022-10-18 20:17:08 +00:00
Lucas Silva
5067d29ba4 Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev am: 6a8e193fad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20216381

Change-Id: I72ec38de9b99e704d909ddf9e21e7ac825b00abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 17:43:35 +00:00
Lucas Silva
6a8e193fad Merge "Update dream summary when dream suppressed by bedtime mode" into tm-qpr-dev 2022-10-18 17:17:25 +00:00
Lucas Silva
51f838ba4b Update dream summary when dream suppressed by bedtime mode
Bug: 246472225
Test: enabled bedtime mode, verified settings summary updated
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.WhenToDreamPreferenceControllerTest"
Change-Id: I4de12f636975b1bdf36898f7a530fde2f55644d4
2022-10-18 13:23:49 +00:00
SongFerng Wang
bd476febf0 Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20116277

Change-Id: Ib62e9adf0e2bdac25821c9f70634c27b26515056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 06:50:09 +00:00
SongFerng Wang
2cd07f51ef Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev 2022-10-18 06:30:34 +00:00
Treehugger Robot
5e52bc9c74 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967 am: 24e8db3335
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I506f283c0dccadcc940245195d5112ca7ec4c154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 05:09:53 +00:00
Treehugger Robot
24e8db3335 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I34ec41a3b0cd28029595e70164501dd1350e96b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 04:42:26 +00:00
Shen Lin
a911e61ce7 Fix crash when input illegal proxy port number
Bug: 253951250
Test: manual and atest
Change-Id: I80d2f0e3ce2df86a081b29d8633e06cfc648baeb
2022-10-18 09:18:57 +08:00
Julia Tuttle
8416222c25 Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193426

Change-Id: I6b4ac70d7ca1d7c4fd76b42c6d26f7361ff3420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 16:07:43 +00:00
Julia Tuttle
5d780a42eb Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev 2022-10-17 14:56:20 +00:00
Simon Wingrove
4884157649 Don't trampoline twice when opening security or privacy
Settings already trampolines to a two-pane version of deeplink
activities, doing another trampoline will wind up creating a second task
covering up the first, with the wrong layout.

Bug: 253554698
Test: manually
Change-Id: Ib7ba5c95cac2f644ade37a41f321d11c8f1d1b89
2022-10-17 14:55:51 +01:00
Shen Lin
72e5a7ea21 Fix crash when showing error dialog in NetworkRequestDialogActivity
Fix: 253913148
Test: manual
Change-Id: I23593da1ef6d72806f22d3501b06a8e7abadb100
2022-10-17 09:30:16 +08:00
Julia Tuttle
e9108aecd8 Default to hiding silent notifications on lockscreen in Settings
Also, fix an errorprone issue.

Bug: 252815574
Test: atest ShowOnLockscreenNotificationPreferenceControllerTest
Change-Id: I46e6d0f15c69abe60ef8505d300e5205b3c71e53
2022-10-15 01:24:19 -04:00
Betty Chang
90a1263b87 Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev am: b2269caa45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176143

Change-Id: I207add249654cc4963ee065b0b161e94c24e9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-15 05:03:37 +00:00
Betty Chang
b2269caa45 Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev 2022-10-15 04:38:00 +00:00
Julia Tuttle
16b7c91e5e Fix some out-of-order imports am: 9f0efa68a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20193425

Change-Id: I85de5768359802bd1800bc88b7ab490631c280e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 19:03:13 +00:00
changbetty
1096417464 [LE Audio] Add LE Audio Devices in Sound Settings
- When connected to the LE Audio Device, it will display "Play XXX on
    LEAduioDeviceName" in Sound Settings.

  - When connected to the LE Audio Device, it will display the LE Audio
    device name in the "Take call on" list for you having a active call(Hands Free).

  - Remove the @Ignore annotation for all the tests and make test
    cases pass.

Bug: 240911615
Bug: 243494881
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AudioOutputSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HandsFreeProfileOutputPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputPreferenceControllerTest
Change-Id: I10db59b33623495a9e9933556c78e20d81e405ea
2022-10-14 06:10:52 +00:00
SongFerngWang
7087388a0f [LE unicast] Using the pairDeviceByCsip API
ag/20176285 changes the API flow.

Bug: 253541065
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=CachedBluetoothDeviceManagerTest
local test and result is on bug (pass)

Change-Id: I2354b464a93b3122b462dc9cc20556f621490d2a
2022-10-14 04:43:39 +00:00
Julia Tuttle
9f0efa68a1 Fix some out-of-order imports
Bug: 20188695
Test: build
Change-Id: I47d463f82bee4e1b22300eb4260dd38dbeb13c88
2022-10-13 21:55:46 -04:00
Chloris Kuo
6e64305274 Disable Enhanced notifications setting when default NAS is not available am: 236eaed326
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20188999

Change-Id: I68d337b4d5b947a7e0af817cb0c76039df18dbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 20:42:21 +00:00
Chloris Kuo
236eaed326 Disable Enhanced notifications setting when default NAS is not available
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
(cherry picked from commit 873b8544e1)
2022-10-13 16:27:35 +00:00
Treehugger Robot
61cc95f7d1 Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a am: c0904055f4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577

Change-Id: If5a0b0e899b0eea3110319c7df89bb23f932e77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 15:19:20 +00:00
Treehugger Robot
c0904055f4 Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577

Change-Id: Ie35b84bc9e348997fc34f58ded21c84e191e6786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 14:35:09 +00:00
Shen Lin
d956175333 Fix "show system apps" status lost when switching on/off dark theme
Bug: 253388290
Test: manual and atest
Change-Id: I5833f94478c2faaf53d40652f0e7ce92adb3e8b6
2022-10-13 12:19:11 +00:00
Behnam Heydarshahi
8b2496eb9e Merge "Add notification volume controller in settings" into tm-qpr-dev am: 7f6c833b89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19940409

Change-Id: Iffd5dcd7eb9ad645807d9529f352582457dc3f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 20:07:05 +00:00
Behnam Heydarshahi
7f6c833b89 Merge "Add notification volume controller in settings" into tm-qpr-dev 2022-10-12 19:37:26 +00:00
Hugh Chen
b1fac0fb92 RESTRICT AUTOMERGE Refactoring settings UI am: f891f7ba86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20034710

Change-Id: I2e6bb7660f690b2aa2db5a2ef4c628e406d674c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 06:35:46 +00:00