Edgar Wang
a930f5eaf8
Merge "Remove injecting multi-user settings into settings itself" into main
2023-11-23 22:02:30 +00:00
Olivier Nshimiye
02399366cd
Merge "Update the getHideInSettingsInQuietMode to getHideInUiInQuietMode" into main
2023-11-23 15:53:28 +00:00
Haijie Hong
e3d823cffd
Merge "Skip authentication in Wifi sharing if the device is unlocked recently" into main
2023-11-23 11:42:52 +00:00
Haijie Hong
ec1b13eb72
Skip authentication in Wifi sharing if the device is unlocked recently
...
BUG: 311168955
Test: atest com.android.settings.wifi.dpp.WifiDppConfiguratorAuthActivityTest
Change-Id: I59674788e04d843541e8fcc3f3305ba295e8d8b1
2023-11-23 10:49:04 +00:00
Yiyi Shen
6ab64aa71f
Merge "[Audiosharing] Set earlist connected device active in sharing." into main
2023-11-23 09:39:44 +00:00
Edgar Wang
40cc58f5a1
Merge "Update SpellCheckerPreference layout to support divider" into main
2023-11-23 07:50:41 +00:00
Yiyi Shen
b82f290fce
[Audiosharing] Set earlist connected device active in sharing.
...
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: I8e0132f3d982fe2723581cd2aafd3cb9a9ed409c
2023-11-23 15:40:50 +08:00
chelseahao
1e0301d70f
[Audiosharing] Move getSummary
to a bg thread.
...
Bug: 308368124
Test: Manual
Change-Id: I6d521681ce8835e5187c43f6ec930fb119f46674
2023-11-23 05:41:06 +00:00
Edgar Wang
2dfae393c4
Merge "Remove SettingsIntelligence log writer" into main
2023-11-23 03:28:13 +00:00
Chelsea Hao
73a95d165a
Merge "[Audiosharing] Create preference for audio streams" into main
2023-11-23 03:19:40 +00:00
Edgar Wang
3755ba0f42
Remove SettingsIntelligence log writer
...
Bug: 259034522
Test: rebuild
Change-Id: I9bc4eee86a251aa30289b2d279bdb84de82d91b1
2023-11-23 09:58:33 +08:00
Bill Yi
9d45161d63
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c2f669606
-s ours am: 875ae1db39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25439648
Change-Id: Iecf78fafc8adc4ee548a7b502a1a99731c929ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-22 23:16:00 +00:00
Treehugger Robot
4897aa1915
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-11-22 21:13:29 +00:00
Treehugger Robot
94bc38cc91
Merge "Migrate Force L3 fallback to SwitchPreferenceCompat" into main
2023-11-22 20:18:41 +00:00
Bill Yi
3bbe3385f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I83784603dfeb75f677e9ab3d4fffd4ef8c87f48c
2023-11-22 12:10:34 -08:00
Bill Yi
875ae1db39
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c2f669606
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25439648
Change-Id: I975b2f9be421bef7e15e811e91a4ec0e286dd85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-22 19:49:02 +00:00
Bill Yi
315fd6c450
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 03110c25cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25440661
Change-Id: Ic07011650702b1b8d9018754c355289dab058898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-22 19:20:50 +00:00
Bill Yi
f64a39a4f3
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-11-22 19:01:02 +00:00
Chaohui Wang
981829067e
Migrate Force L3 fallback to SwitchPreferenceCompat
...
For Material3 migration.
Bug: 306658427
Test: visual - on Widevine settings
Change-Id: Ieb7d3fd61e4d13f3518af61763ab3ec68066d89d
2023-11-22 21:51:37 +08:00
Treehugger Robot
30c908c871
Merge "Show Hotspot network in Network & internet settings" into main
2023-11-22 13:01:07 +00:00
Yiyi Shen
f4d4683a3c
Merge "[Audiosharing] Add device volume controls." into main
2023-11-22 12:57:20 +00:00
chelseahao
1cf98e0046
[Audiosharing] Create preference for audio streams
...
This preference will optionally show a lock icon on the right.
Bug: 308368124
Test: Manual
Change-Id: Ifd899da48a499e4d963f0b8981f8d5f55070d46f
2023-11-22 10:57:28 +00:00
Chelsea Hao
11033433ee
Merge "[Audiosharing] Impl "Listen with" row." into main
2023-11-22 10:56:43 +00:00
Jacky Wang
1ec4e51622
Merge "Prevent NPE in SettingsSliceProvider" into main
2023-11-22 10:56:15 +00:00
Yiyi Shen
4b2c440715
[Audiosharing] Add device volume controls.
...
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: I5330cf3b3b4497af22820657b61279070f9c4af1
2023-11-22 10:32:11 +00:00
XingHai Lu
54e21392c6
Merge "Add sound related B&R function for Onboarding" into main
2023-11-22 10:12:53 +00:00
Weng Su
203931d038
Show Hotspot network in Network & internet settings
...
- Show Hotspot icons
- Show getAlternateSummary instead of original getSummary
Fix: 308187592
Test: unit test
atest -c InternetPreferenceControllerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a9ea40dc71362b372c5adc89b82dbe2024253688 )
Merged-In: I8afe54edebc904c9ec936f5851a33c6c20f13e29
Change-Id: I8afe54edebc904c9ec936f5851a33c6c20f13e29
2023-11-22 09:58:07 +00:00
Yiyi Shen
f473b9f60e
Merge "[Audiosharing] Reimpl audio sharing main switch" into main
2023-11-22 09:48:17 +00:00
chelseahao
43611adcf3
[Audiosharing] Impl "Listen with" row.
...
This row will show the currently connected and active LE buds. There
should be no more than one pair.
Bug: 308368124
Test: Manual
Change-Id: I281d7f7c6debaeb34b8206fe587cb776ea0eb0ec
2023-11-22 09:29:28 +00:00
Jacky Wang
2a617ae872
Prevent NPE in SettingsSliceProvider
...
NPE is raised when run `adb shell content query --uri
content://com.android.settings/settings/slice_uri_pairs`
Bug: 312400299
Test: manual test
Change-Id: I686476e5ea6b68bddbd6045c34bf889e249fa6b5
2023-11-22 17:25:49 +08:00
Shaowei Shen
fd45d6576f
Merge "[PK Setting] Add null check on NewKeyboardSettingUtils.getInputDevice()" into main
2023-11-22 08:11:10 +00:00
Edgar Wang
523d39266c
Update SpellCheckerPreference layout to support divider
...
Bug: 246499664
Test: robotest and visual
Change-Id: I96908f4b566820b20a57e0161d74dfed2c566ea5
2023-11-22 14:59:17 +08:00
shaoweishen
543a7589b1
[PK Setting] Add null check on NewKeyboardSettingUtils.getInputDevice()
...
return null if InputDeviceIdentifier is null in getInputDevice.
Test: n/a
Bug: 307109888
Change-Id: Ie2f951d97e0ff66833d74170e625fb0368d6de42
2023-11-22 05:02:49 +00:00
Yiyi Shen
ddebe7293b
[Audiosharing] Reimpl audio sharing main switch
...
New flow: Automatically add sharing source to connected active device eligible for
audio sharing. And then pop up the dialog for users to choose an additinal eligible device
to share audio.
Old flow: Pop up the dialog first and add sharing source after user
interact to the dialog.
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: If0d1609b2677ca9ecae926c198f305fd1f4e34d3
2023-11-22 11:38:01 +08:00
Chaohui Wang
28bbbf783b
Merge "Reduce flaky of whenIsInstantApp_hasSummaryForInstant" into main
2023-11-22 03:02:30 +00:00
SongFerng Wang
7126fddfe4
Merge "Renew the API getCallState" into main
2023-11-22 01:47:55 +00:00
Bill Yi
1c2f669606
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I32c505e31630b342cada77404500d3a8c9ca00c9
2023-11-21 10:55:32 -08:00
Bill Yi
568223cf61
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id01184bc5ada11e0aff1c64089d9ce92d61710f3
2023-11-21 10:53:47 -08:00
Bill Yi
03110c25cf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78f85491e82830788d0398e93dd2203636aa6cfb
2023-11-21 10:50:17 -08:00
Amith Yamasani
6cf28bc052
Merge "Flag guard the quarantined apps screen" into main
2023-11-21 17:32:44 +00:00
Oli Thompson
c1e33f5080
Merge "Guard against duplicate calls to setQuietModeEnabled" into main
2023-11-21 13:37:03 +00:00
Marcelo Arteiro
a19a7e2cc9
Merge "Fixing wriong color on Setting's Profile Selector" into main
2023-11-21 13:31:50 +00:00
Edgar Wang
6024953f02
Remove injecting multi-user settings into settings itself
...
- It can improve performance because we use less injected item
Bug: 242152448
Test: robotest
Change-Id: I892e1ac9c3f8297c489fc1fec934e9f5f2e2f5e9
2023-11-21 21:05:54 +08:00
Treehugger Robot
e8f6a7572c
Merge "Handle cached bluetooth device with stylus pref" into main
2023-11-21 12:59:39 +00:00
Yiyi Shen
5bbccc8701
Merge "[Audiosharing] Sort sharing candidates in Utils." into main
2023-11-21 12:23:59 +00:00
Ajinkya Chalke
dcb5bc6da5
Handle cached bluetooth device with stylus pref
...
- Checking whether a stylus has a tail button key is not possible when
the device is cached, so assume that it does.
- Updated StylusDevicesControllerTest to use SwitchPreferenceCompat as
there were unrelated tests that were failing. The actual test that
would've caught the bug only started failing after the unrelated test
failures were fixed.
Bug: 311334474
Test: atest StylusDevicesControllerTest
Flag: N/A
Change-Id: Iee2899bf0a77a70f4a4f76833f485d511d919c40
2023-11-21 11:15:29 +00:00
Charlotte Lu
41252bc6e6
Merge "Add delete apns" into main
2023-11-21 11:15:16 +00:00
Olivier Nshimiye
fcafdcffb0
Update the getHideInSettingsInQuietMode to getHideInUiInQuietMode
...
Bug: 307515481
Test: manual
Change-Id: I75996df11e9276eff5c388b509d630a0d4b3d39f
2023-11-21 10:27:48 +00:00
Hansen Kurli
d5e7842c4d
Merge "Create a new string to alert unsupported vpn start." into main am: 3c569b5379
am: 9827ddae2a
am: b4cb5019ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2831551
Change-Id: I3b232d6f1e624f660e906626e5e4d3107070201a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-21 10:03:58 +00:00
Hansen Kurli
d881186df4
Merge "Create a new string to alert unsupported vpn start." into main am: 3c569b5379
am: 42ad676a4e
am: b7ba4be4b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2831551
Change-Id: Ib74982008d3e123b00cf235f39f1b2d8f182c585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-21 10:02:27 +00:00