Yining Liu
a20aef38cb
Update setting text of notification cooldown
...
Update setting text of notification cooldown (also known
as adaptive notification, and notification avalanche).
Fix: 354052311
Flag: com.android.server.notification.polite_notifications
Test: Manual, Settings - Notifications - Notification cooldown
Change-Id: Id513350939f12ef5fa7e58c5cbbb3197b259978f
2024-07-19 23:12:25 +00:00
Joshua Mccloskey
2004df98f1
Merge "Too short error message on CDC is no longer red." into main
2024-07-19 21:38:01 +00:00
Matías Hernández
8ae1067818
Merge "Show icons for allowed sounds" into main
2024-07-19 17:06:27 +00:00
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
SongFerng Wang
b21b629021
Merge "Fix SmartForwardingActivity crash at screen rotation" into main am: 14393a5f06
am: bce8fc79e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2855525
Change-Id: I0406d14725638b6c3da33e0c7b115c1692725b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-19 06:12:12 +00:00
SongFerng Wang
bce8fc79e8
Merge "Fix SmartForwardingActivity crash at screen rotation" into main am: 14393a5f06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2855525
Change-Id: Ieb6ffb8c2f479ffcc30d60440df649618074e420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-19 05:55:14 +00:00
Candice Lo
b9e9632f32
Merge "feat(EvenDimmer): refactor the initialization process" into main
2024-07-19 05:50:33 +00:00
SongFerng Wang
14393a5f06
Merge "Fix SmartForwardingActivity crash at screen rotation" into main
2024-07-19 05:41:40 +00:00
Yining Liu
50f762ef5a
Update the text for Notifications cooldown settings
...
Update the text for Notifications cooldown (previously
known as Adaptive notifications) settings.
Fix: 354052311
Flag: com.android.server.notification.polite_notifications
Test: N/A
Change-Id: Iacada2effe312d34726a7cbccbd97d919af4329a
2024-07-19 00:44:19 +00:00
Matías Hernández
bc0b3342bd
Merge "Show icons for apps bypassing DND" into main
2024-07-18 11:54:51 +00:00
Joseph Vincent
9707271dad
Merge "Start PrivateSpaceDeleteActivity in full screen on foldables" into main
2024-07-18 10:28:38 +00:00
SongFerng Wang
410f699c6f
Merge "Settings: Adapt edge-to-edge enforcement" into main am: 9befb6cd8f
am: e910d895f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3142636
Change-Id: I4a7f739df1b12c2151a6b4a484881360541c113d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-18 10:08:48 +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
SongFerng Wang
e910d895f1
Merge "Settings: Adapt edge-to-edge enforcement" into main am: 9befb6cd8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3142636
Change-Id: Ibfc5f8fb007d93d618c4a0c67e396677329b5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-18 09:48:49 +00:00
SongFerng Wang
9befb6cd8f
Merge "Settings: Adapt edge-to-edge enforcement" into main
2024-07-18 09:31:55 +00:00
Chaohui Wang
9503f42efb
Merge "Clean up UiccInfoEntity unused fields" into main
2024-07-18 08:44:19 +00:00
Yuchen Sun
028dd20d96
Merge "Clean up slice from spa and move androidx.slice dependency to Settings." into main
2024-07-18 08:26:05 +00:00
Yuchen Sun
93036e2045
Clean up slice from spa and move androidx.slice dependency to Settings.
...
Test: build successfully
Flag: EXEMPT clean up
Bug: 352442832
Change-Id: Ifc222a91991d4924f1cb7b5c1e7fd90968bfed26
2024-07-18 08:25:48 +00:00
Treehugger Robot
770917dc6b
Merge "Fix whenNoInstaller_notDisplayed" into main
2024-07-18 06:17:42 +00:00
Treehugger Robot
2e3e6d69e8
Merge "Add wait for title_displayed" into main
2024-07-18 04:39:30 +00:00
Chaohui Wang
9187f1fd7d
Add wait for title_displayed
...
Bug: 346420411
Flag: EXEMPT test only
Test: atest BackgroundInstalledAppsPageProviderTest
Change-Id: I8047cd0aa4e414df83bcc69ebf21f245f985b447
2024-07-18 11:51:51 +08:00
Chaohui Wang
512141619d
Fix whenNoInstaller_notDisplayed
...
Which is forgot to update in Icd5559bce06c059844269d70926b3c0b39589edb
Bug: 346420411
Flag: EXEMPT test only
Test: atest AppInstallerInfoPreferenceTest
Change-Id: If21215b81008c03a6b6ad2a77a90073a6d708390
2024-07-18 11:39:13 +08:00
Chaohui Wang
dcc60f0371
Update FakeFeatureFactory
...
Return null for getSurveyFeatureProvider, since this will be called by
SurveyMixin during test.
Bug: 346420411
Flag: EXEMPT test only
Test: atest ResetNetworkConfirmTest
Change-Id: I7d0fab039bf96a2ef453e35dcf88cbdb77f01523
2024-07-18 11:22:18 +08:00
Joshua McCloskey
d11b1dc739
Too short error message on CDC is no longer red.
...
Test: atest ChooseLockPasswordTest
Fixes: 325097409
Flag: none
Change-Id: I09f910eeb28d117f6a5008d64b8d3eb5a1731800
2024-07-17 17:00:29 +00:00
Treehugger Robot
ee83f6a5d7
Merge "Tests - Add mandatory biometric prompt to platform surfaces (1/N)" into main
2024-07-17 15:37:02 +00:00
Asmita Poddar
541038ebb7
Merge "Add Mouse keys A11Y settings to PK settings page" into main
2024-07-17 10:03:26 +00:00
Daniel Huang
9f5e410191
Merge "Add accessibility appearance settings backup feature flag" into main
2024-07-17 09:28:02 +00:00
danielwbhuang
7b24af118c
Add accessibility appearance settings backup feature flag
...
Bug: 341210043
Flag: com.android.settings.flags.accessibility_appearance_settings_backup_enabled
Test: manual
Change-Id: I71163c3dcdb81aa9621ae47e69a694b42331b8b7
2024-07-17 16:14:58 +08:00
Chaohui Wang
371e7b09e1
Clean up WifiPrimarySwitchPreferenceController
...
This one is not used any more.
Bug: 167474581
Flag: EXEMPT clean up
Test: m Settings
Change-Id: Ia2439af2b3a6b643f41f6e3fce9e4bf1126c282e
2024-07-17 16:02:40 +08: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
Chaohui Wang
0ffd546f2f
Clean up UiccInfoEntity unused fields
...
It's safe since MobileNetworkDatabase is in memory only.
Bug: 348118234
Flag: EXEMPT clean up
Test: manual - check Mobile Settings
Change-Id: Icea406a3c2e633ee51160e51b1af553b4f3034dc
2024-07-17 14:54:49 +08: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
josephpv
927e197db3
Start PrivateSpaceDeleteActivity in full screen on foldables
...
Screenrecording link:
b/342563741#comment2
Bug: 342563741
Test: Manual
Flag: android.multiuser.fix_large_display_private_space_settings
Change-Id: I428ef4af12e736880313b06e832b58a46b23a08a
2024-07-16 18:48:21 +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