Diya Bera
da8c78f093
Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev am: d66e0c4c75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20249709
Change-Id: If6de61542beed2a43d775a0b3706b11a95b5160b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 21:07:53 +00:00
Diya Bera
d66e0c4c75
Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev
2022-10-25 20:29:24 +00:00
Betty Chang
6d2a0cdf0d
Merge "[LE Audio] Remove the broadcast icon when the device does not support broadcast feature" into tm-qpr-dev am: a7b9107027
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20271146
Change-Id: I742b41599ca0d33c7f6c33bb607a8bf89406cb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 09:23:57 +00:00
Betty Chang
a7b9107027
Merge "[LE Audio] Remove the broadcast icon when the device does not support broadcast feature" into tm-qpr-dev
2022-10-25 08:49:56 +00:00
Treehugger Robot
c2a1326104
Merge "Ensure search highlight position when scheduled runnable starts" am: fcd941b4eb
am: c54246e0c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2263782
Change-Id: Ic0349cd744ffc1b32b46838c28d3aba600f7172a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 08:32:48 +00:00
Weng Su
32a66a67f3
Add Ethernet tethering subtext for tablet project
...
- Add "Share tablet's internet connection via Ethernet"
Bug: 243876722
Test: manual test
Change-Id: I9fc50b9f4bc4ada30a033f4ccd95dd7159b967b1
2022-10-25 16:26:16 +08:00
Treehugger Robot
c54246e0c8
Merge "Ensure search highlight position when scheduled runnable starts" am: fcd941b4eb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2263782
Change-Id: I3d0a338bb220705a255a7abc123d490ee19f44af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 08:01:42 +00:00
Treehugger Robot
ed7625f667
Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f0698a
am: 9fd4f504e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267745
Change-Id: I2de6c43683b2bb0b6473e3623415237f046408bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 07:43:25 +00:00
Treehugger Robot
fcd941b4eb
Merge "Ensure search highlight position when scheduled runnable starts"
2022-10-25 07:35:26 +00:00
Treehugger Robot
9fd4f504e2
Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f0698a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267745
Change-Id: I8a6caaabac8c6e718bb52edcf8c390ca22dd579c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 07:11:48 +00:00
Betty Chang
70278a9c98
Merge "[LE Audio] Only add main device for LE Audio devices in Take call on list" into tm-qpr-dev am: 3030e61265
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20265111
Change-Id: Ieb9cdefc4fd9f58c0fa75185986e5d71f9a5f495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-25 06:36:08 +00:00
Treehugger Robot
8959f0698a
Merge "Fix typo in WifiCallingSettingsForSub"
2022-10-25 06:30:47 +00:00
Betty Chang
3030e61265
Merge "[LE Audio] Only add main device for LE Audio devices in Take call on list" into tm-qpr-dev
2022-10-25 06:07:18 +00:00
Shen Lin
f20f8bc71a
Fix typo in WifiCallingSettingsForSub
...
test: compile pass
Change-Id: I719a9a634a3b321533462f8e9fef9c183c042335
2022-10-25 11:37:04 +08:00
Diya Bera
9e1649273f
Remove flicker during fingerprint enrollment
...
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 247581748
Change-Id: I7e456670fa0a8527f47bd8057fb755c0c2c1eeeb
2022-10-24 22:21:58 +00:00
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
changbetty
4f42ca1eac
[LE Audio] Remove the broadcast icon when the device does not support
...
broadcast feature
Bug: 254743785
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputIndicatorWorkerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I02e429b3a306e2f9b0e2342118649208617c4944
2022-10-24 12:03:23 +00:00
Simon Wingrove
ea8a4adc91
Use correct menu key highlights for safety center
...
Adds a menu key for the security deeplink, and adds a remapping to
ensure the correct key is used depending on if safety center is
available or not.
Bug: 253553761
Test: manually
Change-Id: I8ed9efd084e1fdfa298be1826a215218c84b1f4a
2022-10-24 10:08:52 +01:00
changbetty
abc69c34de
[LE Audio] Only add main device for LE Audio devices in Take call on
...
list
Bug: 254212589
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AudioOutputSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HandsFreeProfileOutputPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputPreferenceControllerTest
Change-Id: I7831f12ca259aac3d60f4370ffc659a32fed3296
2022-10-24 06:52:03 +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
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
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
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
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
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
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
Bonian Chen
90dcc7c5c1
Merge "[Settings] align the long press behavior on secondary sim"
2022-10-19 08:01:34 +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