Matías Hernández
352100397f
Show icons for allowed sounds
...
(Some icons are temporary, until we get the final assets)
Also some fixes/improvements to CircularIconsPreference:
* Show the correct placeholder and +N icons.
* Fix the displayIcons-before-measure case (global layout listener was incorrect).
* Properly cancel pending image load futures (field didn't point to the actual future).
* Don't reload icons if it's the same set (depends on equals() for the items, so unfortunately doesn't work for AppEntry yet).
Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: I9d029a5fdd785ada4e2ba4d8a90eba72b5fb9085
2024-07-19 15:30:45 +00:00
Matías Hernández
0ebc865c5e
Show icons for apps bypassing DND
...
(Several things pending, such as the +n icon and the correct pending icons, but it's a start).
Test: atest com.android.settings.notification.modes
Bug: 346551087
Flag: android.app.modes_ui
Change-Id: Ifd2ab6a8bb447739dc8ffe400c3960779d477fd6
2024-07-18 11:59:06 +02:00
Chaohui Wang
fe712d3ea3
Merge "Always set cross sim calling" into main
2024-07-17 07:48:59 +00:00
Tom Hsu
0168d94464
Merge "Fix network can't handle simultaneously SS request for both subs" into main am: f20f297cfa
am: 72541b8b19
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2643178
Change-Id: I478fb01ec9f956c040e08e6c3ae2fa475dc7fd3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 07:28:19 +00:00
Tom Hsu
72541b8b19
Merge "Fix network can't handle simultaneously SS request for both subs" into main am: f20f297cfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2643178
Change-Id: Id6f676ba5fe1ae096c6b3ed0ed75a00e2c1d92e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 07:13:32 +00:00
Tom Hsu
f20f297cfa
Merge "Fix network can't handle simultaneously SS request for both subs" into main
2024-07-17 06:56:04 +00:00
Edgar Wang
1010a85eda
Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main am: 969c26392d
am: ff519515b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3176079
Change-Id: Id47bd03f0686b8f4dbb0c50383d374bbd51657c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 01:37:19 +00:00
Edgar Wang
ff519515b6
Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main am: 969c26392d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3176079
Change-Id: Id9f83a06f922904ddf56ed803fa58cd362eba59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 01:13:36 +00:00
Edgar Wang
969c26392d
Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main
2024-07-17 00:53:02 +00:00
Yomna Nasser
54e81b2dcd
Merge "Remove searchability of CellularSecuritySettingsFragment" into main
2024-07-16 20:31:16 +00:00
Bill Yi
5f566fa182
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-16 19:59:03 +00:00
Bill Yi
37e279f40d
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-16 19:59:03 +00:00
Bill Yi
578d019e6e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-16 19:59:03 +00:00
Lifu Tang
dc54d60a48
Merge "Fix capitalization in location settings footer" into main
2024-07-16 19:20:32 +00:00
Lifu Tang
7301e6a098
Fix capitalization in location settings footer
...
Bug: 191301017
Flag: EXEMPT resource only update
Change-Id: Id2eeeb3687c4e6255c222615d265771a3e36438e
2024-07-16 19:20:09 +00:00
Automerger Merge Worker
fe037fff2b
Merge changes from topic "am-3c320492c6064dff82f4c26616d2a5e5" into main
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f6d9c8f8da
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1b214cb88
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: c2d30c8e73
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22eb84ad97
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e8f3f44e
-s ours
2024-07-16 17:56:51 +00:00
Treehugger Robot
c4419857d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f6d9c8f8da
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28329101
Change-Id: I66ec87b501846e5912e0984b74bd00a486fc3583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:26 +00:00
Bill Yi
49c265ae11
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1b214cb88
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28329101
Change-Id: I57c769ad5519461c36cce2719bab014d9d479d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:22 +00:00
Treehugger Robot
8467849606
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: c2d30c8e73
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328378
Change-Id: I305b29f837ebe00f7eb99a5f6804c6f811af5831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:19 +00:00
Bill Yi
d2fac657d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22eb84ad97
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328378
Change-Id: Ica383cb05ca9c312477eb2c195b0300c3c98d910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:09 +00:00
Bill Yi
a6a2746913
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e8f3f44e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328375
Change-Id: I7f20db98e29912b35d79ed16422b73969fb0d776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:53:06 +00:00
Treehugger Robot
13cdbdf68a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 8e2e6d144a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28327438
Change-Id: I43f2949256eed85421a7c7a3a966b635adb4129f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:52:26 +00:00
Bill Yi
fe0242f1fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ca881be1
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28327438
Change-Id: I6257dbed9ef8580d1669291be30dcdc0ffdf0cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:52:19 +00:00
Bill Yi
f4222109e8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f0d501ae0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28328373
Change-Id: I449aa81c3da0c0441bfb1edc156ec08eff740fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-16 17:51:36 +00:00
Treehugger Robot
f6d9c8f8da
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-16 17:36:05 +00:00
Treehugger Robot
c2d30c8e73
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-16 17:36:05 +00:00
Treehugger Robot
8e2e6d144a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-07-16 17:35:19 +00:00
Tetiana Meronyk
c641849a42
Add Multiuser team to the OWNERS file for users package in Settings
...
Bug: 352721898
Change-Id: Ica47025c4ba5033a15422931fd9f8ed85ae97e9e
Test: N/A
2024-07-16 12:05:25 +00:00
Chaohui Wang
fb0583404f
Always set cross sim calling
...
By CrossSimCallingViewModel, in SIMs and per SIM settings page.
To ensure the status is always right, including the case after the
onboarding set up finished.
Fix: 347882381
Fix: 348529996
Flag: EXEMPT bug fix
Test: manual - turn on / off "Automatic data switching" on SIMs
Test: manual - turn off "Automatic data switching" during onboarding
Change-Id: Icc2eacb67850fa7b3aa0fe310cd09a0e0147912b
2024-07-16 17:46:23 +08:00
Matías Hernández
d133ec93ab
Merge "Distinguish the profile of DND-bypassing apps" into main
2024-07-16 09:15:54 +00:00
Matías Hernández
da3ae255e3
Distinguish the profile of DND-bypassing apps
...
Bug: 353273192
Test: atest ZenModeAppsLinkPreferenceControllerTest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I31d8836dbba38d04c9ab3b3180025cb8ddcfbe6d
2024-07-16 08:59:53 +00:00
Haijie Hong
de9d706146
Merge "Determine LeAudio toggle visibility after mIsLeAudioOnlyDevice is initialized" into main
2024-07-16 08:14:44 +00:00
Haijie Hong
7a40ecd953
Determine LeAudio toggle visibility after mIsLeAudioOnlyDevice is initialized
...
Bug: 352431349
Test: atest BluetoothDetailsProfilesControllerTest
Flag: com.android.settings.flags.hide_le_audio_toggle_for_le_audio_only_device
Change-Id: Ic6a8327f7c8e680a29dfd82407ac8304fc25cf89
2024-07-16 14:14:52 +08:00
Yiyi Shen
9eaf954e19
Merge "Fix dup preference key on Connected devices page" into main
2024-07-16 02:45:44 +00:00
Bill Yi
a1b214cb88
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I705542061755b43497171efdf1f9883e20b45995
2024-07-15 19:24:32 -07:00
Bill Yi
3543116e8c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I05a0ec583d85e8dd233661faa40dd8c640232387
2024-07-15 19:23:42 -07:00
Bill Yi
22eb84ad97
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3241e023c3da29375d7f385d864725c1155762ae
2024-07-15 19:21:37 -07:00
Bill Yi
cfff5ea92e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f30248de4bb1ecf16f8d752136e5dc8763930f6
2024-07-15 19:19:51 -07:00
Bill Yi
42e8f3f44e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33c17b49df959e7f2a8512574263800076c271f3
2024-07-15 19:18:23 -07:00
Bill Yi
a9d5afd67c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0b2f293b6ff4fea5706246bd42a65e8233ad0a24
2024-07-15 19:17:33 -07:00
Bill Yi
9f0d501ae0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7bb34378cecb16ddb9f073dc8965808fc18f8b03
2024-07-15 19:16:05 -07:00
Bill Yi
c1ca881be1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic36c209805a453537b7de990a9645a1aab79e6d6
2024-07-15 19:14:40 -07:00
yomna
62004763e1
Remove searchability of CellularSecuritySettingsFragment
...
Test: m & manual
Bug: b/335554085
Flag: EXEMPT bug fix
Change-Id: Ia226b0848d70a307b80060049ec24b9714ee476a
2024-07-16 01:17:25 +00:00
Treehugger Robot
f1cd781ed1
Merge "Move PreferenceControllers to member variables to prevent memory leak" into main
2024-07-15 22:41:43 +00:00
Chun-Ku Lin
ec61f8bea3
Move PreferenceControllers to member variables to prevent memory leak
...
- Move PreferenceControllers to xml
- Clean up the PreferenceController so that it's less tied to a fragment
- Update and clean up the related robolectric test, so there are less
mocks needed
Bug: 352606511
Test: manually check the Color Correction screen is shown correctly, and
choosing color correction options are reflected correctly
Test: atest DaltonizerRadioButtonPreferenceControllerTest
Test: atest ToggleDaltonizerPreferenceFragmentTest
Flag: EXEMPT (moving controller to xml can't be flagged)
Change-Id: I89b9366cfd7a398bb0572d34226d31d49373fd94
2024-07-15 21:34:14 +00:00
Pat Manning
c8c8c53760
Merge "Update Touchpad settings page to include mouse." into main
2024-07-15 10:52:10 +00:00
Treehugger Robot
2db5d1618f
Merge "Show less secure warning in Network details settings" into main
2024-07-15 08:00:42 +00:00
Weng Su
05b28d24c3
Show less secure warning in Network details settings
...
- Show warning when device connected to WEP protocol
Bug: 331973632
Flag: EXEMPT bugfix
Test: Manual testing
atest -c WepLessSecureWarningControllerTest
Change-Id: I54a9bafb2c672db44d47259d6acc49c02046cb81
2024-07-15 14:51:25 +08:00
Chaohui Wang
02849149de
Merge "Revert^2 "Support search "Mobile data""" into main
2024-07-15 05:35:40 +00:00
Vincent Wang
8d235a2fc8
Merge "Remove package biometric2 from AOSP settings" into main
2024-07-15 05:00:06 +00:00