Yiyi Shen
24589b1668
Merge "[Audiosharing] Add flag to start broadcast with no lea headset connected" into main
2024-05-30 07:00:20 +00:00
Chaohui Wang
5920567bee
Remove unused "androidx.test.rules" from production
...
Bug: 316941721
Test: m Settings
Change-Id: I995efda7e4b9dbcb7a3dafcda6da0346153fa60e
2024-05-30 12:26:30 +08:00
Ram Peri
cffe3114c0
Merge "Disable ChooseLockTypeDialogFragmentTest for robolectric" into main
2024-05-30 03:54:11 +00:00
Treehugger Robot
7a0d5b98e8
Merge "Split ChangeReason and decouple it from Observer" into main
2024-05-30 02:33:11 +00:00
Joseph Vincent
42508ae03d
Merge "Add footer in private space auto lock settings page" into main
2024-05-30 01:40:03 +00:00
Ram Peri
985b27c6a1
Disable ChooseLockTypeDialogFragmentTest for robolectric
...
Flag: NA
Bug: 342667939
Test: atest SettingsRoboTests
Change-Id: I13807fd0feb399ab000350152e1de7d67b4e96da
2024-05-29 16:07:27 -07:00
Xin Li
a233ff2126
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: f0e00b8bf7
-s ours
...
am skip reason: Merged-In I96574a79eba581db95d387f0d9c9fde2e004c41c with SHA-1 c9a3eeb792
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27273909
Change-Id: Id97dd62aae31c89c29ed449c33ae86adbe2bb58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-29 20:48:53 +00:00
Bill Yi
8561428d5d
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-29 19:23:14 +00:00
Bill Yi
685c5e83e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-29 19:23:14 +00:00
josephpv
5fd6d6435b
Add footer in private space auto lock settings page
...
Add a footer note to private space auto lock settings page that apps in
private space may need to be authenticated unlock when a separate lock
is set for private space.
Screenshot:
go/ss/7fE8epun3A2hgq4.png
Bug: 343166689
Test: Manual
Change-Id: I18c650eba128da512116a3166babb49f7ef33bb3
2024-05-29 19:07:20 +00:00
Treehugger Robot
7026a5d679
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 17850eba10
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27568748
Change-Id: I70f324f0ad1052e37066868f4a9bcc4178cb59c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-29 18:52:14 +00:00
Bill Yi
d1b0bf70f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88815b8cbf
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27568748
Change-Id: Id05f1a276dc4ec3b0083733e36f2c3e11c36a47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-29 18:52:07 +00:00
Automerger Merge Worker
be19745ba8
Merge changes from topic "am-e432fa3571f248c4a6bde8fb64f5dc19" into main
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: b26c34ad8b
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b64dc1cbdb
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69d5f22731
-s ours
2024-05-29 18:50:08 +00:00
Bill Yi
f3a44325c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a27faaa3ed
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27568552
Change-Id: If82e0a1578519bacbe391f5984d4ad2b1b21ce46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-29 18:47:47 +00:00
Treehugger Robot
1714253488
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: b26c34ad8b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27568749
Change-Id: Iada0e4d36dec87b47d1c2c05791ad797b9386c61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-29 18:46:54 +00:00
Bill Yi
5c04d8dc09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b64dc1cbdb
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27568749
Change-Id: I1b39688c5ae193057771b020c242cb496ab47a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-29 18:46:45 +00:00
Bill Yi
a2204d9a0c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69d5f22731
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27568554
Change-Id: I5addc8175e2b6f1a617cb8dbe6e7e3b3906816b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-29 18:46:34 +00:00
Treehugger Robot
17850eba10
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-05-29 18:39:00 +00:00
Treehugger Robot
b26c34ad8b
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-05-29 18:38:20 +00:00
Vlad Marica
e968a66489
Merge "Ignore OEM Unlocking when wiping PDB during factory reset on V+" into main
2024-05-29 16:23:18 +00:00
Austin Wang
0e97f03274
Merge "Add "icons" search term for Wallpaper & style" into main
2024-05-29 16:03:04 +00:00
Alexander Roederer
4e10ac8dae
Merge changes from topic "b308819928-ModesSettingsAppBreakthroughPage" into main
...
* changes:
Moves ZenModeBypassingAppsSettings into modes dir
Adds modes settings page for bypassing apps
2024-05-29 14:20:02 +00:00
Alexander Roederer
c50457613e
Moves ZenModeBypassingAppsSettings into modes dir
...
Copies these files into modes dir, so we can continue to deprecate the
old zen directory
Bug: 308819928
Test: flash+test, atest ZenModeAllBypassingAppsPreferenceControllerTest,
atestZenModeAddBypassingAppsPreferenceControllerTest
Flag: android.app.modes_ui
Change-Id: Ib18930bb16a3d675e460028f5c52ef32060541ad
Change-Id: Id6c8d834bbd106fef068c5f04acf8cd71229a5e3
2024-05-29 12:23:59 +00:00
Liahav Eitan
310fc717c4
Merge "Increase char limit for add_device_admin_msg" into main
2024-05-29 10:39:42 +00:00
Jigar Thakkar
379a0af7b0
Merge "Do not request confirmation by default for private space unlocks" into main
2024-05-29 10:29:05 +00:00
Edgar Wang
fc53dbe13b
Merge "Fix homepage icon didn't hide in portriat mode" into main
2024-05-29 08:56:32 +00:00
Edgar Wang
fb30cb68cf
Fix homepage icon didn't hide in portriat mode
...
- also fix don't tint homepage icons when homepage_revamp enabled
Bug: 343162224
Test: manual
Change-Id: I85b65239cb852cd914a5fd889ec366bf336fd446
2024-05-29 08:54:12 +00:00
Yiyi Shen
bfdcc82dc7
[Audiosharing] Add flag to start broadcast with no lea headset connected
...
Allow audio sharing with no connected le audio headset when settings_need_connected_ble_device_for_broadcast is false
Bug: 343277847
Test: atest
Change-Id: I560338d53ddf290550faf8198cd7173bb734d150
2024-05-29 15:46:37 +08:00
Tom Hsu
c3e9cd5969
Merge "Fix Crash due to runtime exception from CarrierManager" into main
2024-05-29 06:38:30 +00:00
Bill Yi
e5a29ecbb5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I601d614a72a4d1b3d67b9b88e5717a5243dfb11b
2024-05-28 22:20:44 -07:00
Bill Yi
b64dc1cbdb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I167a2ec1fe7d85159293889ad39457f59dfca45e
2024-05-28 22:18:39 -07:00
Bill Yi
69d5f22731
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92e35e96af8bdaf40189cb4418ab20163c081aaf
2024-05-28 22:15:18 -07:00
Bill Yi
deb9aa4f2c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I538f774862561a3af25bb1ddc6f08f295603e9a6
2024-05-28 22:14:26 -07:00
Bill Yi
88815b8cbf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib10266f4f4e744e3115e97b717aa6068ad3e6be6
2024-05-28 22:12:56 -07:00
tomhsu
a5f3d46539
Fix Crash due to runtime exception from CarrierManager
...
Fix: 329754400
Test: atest passed
Change-Id: I6065160dcd15d547241dd8bc0f9f99c336c59625
2024-05-29 05:11:59 +00:00
Bill Yi
a27faaa3ed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice51fda33549e4d4e95a29e5c3e6f99b1213ccba
2024-05-28 22:11:35 -07:00
Tom Hsu
49abe4c03d
Merge "Fix when edittext only has space and cause name look like blank" into main
2024-05-29 05:08:07 +00:00
Treehugger Robot
d20abfa4c8
Merge "Reduce the number of calls to updateAllPreferences" into main
2024-05-29 04:45:59 +00:00
Chaohui Wang
48e3f2a882
Merge changes Iccd209fd,Ia0c32882 into main
...
* changes:
Refactor signal strength in SIM status
Refactor SimStatusDialogRepository
2024-05-29 04:13:32 +00:00
Jason Chiu
5d44b3f0c8
Merge "Suppress rawData settings from indexing when page is disabled for search" into main
2024-05-29 03:51:38 +00:00
tomhsu
d5556c59e9
Fix when edittext only has space and cause name look like blank
...
fix: 335763360
Test: Manual test. see b/335763360#comment14
Test: atest passed
Change-Id: I9ebae13039d7b78b7acfea545a89d3096aa82c31
2024-05-29 03:42:35 +00:00
Sunny Shao
c725c5ba5a
Split ChangeReason and decouple it from Observer
...
Observer is flexible to be used for other scenarios.
Bug: 325144964
Test: atest SettingsLibDataStoreTest
Test: atest com.android.settings.fuelgauge
Change-Id: I50c0c6267b29460efa3861e609d64a4d92db7b89
2024-05-29 11:39:23 +08:00
Chun-Ku Lin
774bbc1ff2
Reduce the number of calls to updateAllPreferences
...
We call updateAllPreferences in onCreate and onResume. If we always call
the method in onResume, the call in onCreate seemed redundant.
Bug: 327052480
Flag: EXEMPT low risk bugfix
Test: manual (able to see the accessibility screen as before)
Test: atest com.android.settings.accessibility
Change-Id: I40b44ed6b667f7b1375ec0e339fc2b28a3f70dc5
2024-05-29 03:15:15 +00:00
Chun-Ku Lin
a384bb2cbc
Merge "Use CheckFlagsRule when the test requires the device's implementation" into main
2024-05-29 03:10:17 +00:00
Jason Hsu
e6c6b24f1e
Merge "Add Quick Settings shortcut option into Hearing Devices accessibility settings page" into main
2024-05-29 02:55:37 +00:00
Joseph Vincent
9ebdedd2f6
Merge "Private space auto lock on device restart during setup" into main
2024-05-29 02:12:44 +00:00
Chun-Ku Lin
0122f8a1dc
Use CheckFlagsRule when the test requires the device's implementation
...
Bug: 341699461
Test: atest com.android.settings.accessibility on next-userdebug build
Flag: TEST_ONLY
Change-Id: I348252519a8af4b7c890b4e8a03752c918c94b94
2024-05-29 01:35:09 +00:00
Austin Wang
309599bd37
Add "icons" search term for Wallpaper & style
...
"Themed": handled by "theme"
"Themed icon": handled by "icon"
"Themed icons": missing, should be handled by "icons"
Flag: EXEMPT bugfix
Fixes: 328165760
Test: manual
Change-Id: I58dc6e02c995423aa1b5e12e7c0326f57f472248
2024-05-28 15:16:44 -07:00
Alexander Roederer
c512046eb9
Adds modes settings page for bypassing apps
...
Adds the settings page that a user will reach from a mode settings page
when they tap on "App," to allow them to select whether all, none, or
priority modes can break through and send notifications.
Bug: 308819928
Bug: 331267485
Flag: android.app.modes_ui DEVELOPMENT
Test: build and test, controller unit tests
Change-Id: I5bcebfca0fc2882f839afdced8d2b817dad14e6c
2024-05-28 22:12:27 +00:00
Kevin Liu
1df39c3d5f
Merge "Add strict_mode: false" into main
2024-05-28 20:09:07 +00:00