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
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
Tom Hsu
c3e9cd5969
Merge "Fix Crash due to runtime exception from CarrierManager" into main
2024-05-29 06:38:30 +00: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
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
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
Julia Reynolds
a5a7c14b0f
Merge "Add button for activating modes manually" into main
2024-05-28 20:08:25 +00:00
SongFerng Wang
b462f9fa11
Merge "The pages of sim onboarding flow is wrong." into main
2024-05-28 19:58:55 +00:00
David Jacobo
7b986e7e45
Merge "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS"" into main
2024-05-28 19:38:10 +00:00
Lucas Silva
593ab5ee2d
Merge "Fix CommunalPreferenceControllerTest" into main
2024-05-28 19:13:36 +00:00
Bill Yi
c9bd94276d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8aa583506f
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27545784
Change-Id: I2acb88144d2ea3b5a3ee934d8b337316a842c581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-28 18:58:56 +00:00
Bill Yi
92d1924f2b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f24ce25bf0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27545806
Change-Id: I3a6f0019697c30170185764243f966983681deb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-28 18:56:08 +00:00
Bill Yi
9229014769
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-28 18:45:20 +00:00
Bill Yi
2efd6d30fd
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-05-28 18:45:20 +00:00
Jigar Thakkar
176f1a630a
Do not request confirmation by default for private space unlocks
...
Fix face unlock confirmation button behavior to respect "always
require confirmation" setting. Adjust the description of the
confirmation toggle in private space face unlock settings to
reflect this change.
Screenshot: https://screenshot.googleplex.com/4uHfm9Z3ZE56ZaT.png
Bug: 342383195
Test: Tested manually by flashing local build
Change-Id: I0f742839a862fe66cacad9f5704dbe8b0df3a0c2
2024-05-28 17:59:17 +00:00
Lucas Silva
8b13cd4b6d
Fix CommunalPreferenceControllerTest
...
Migrate test to robolectric, as this test doesn't require a device to
run. This also speeds up the test, and allows for use of roboelectric
shadows.
Fixes: 337417918
Test: atest CommunalPreferenceControllerTest
Flag: EXEMPT fix broken test
Change-Id: I32b2760c98bf527b33a8ccbe46314395a03da1e0
2024-05-28 13:21:58 -04:00
Julia Reynolds
97b462dbf0
Add button for activating modes manually
...
Fixes: 308819907
Flag: android.app.modes_ui
Test: ZenModeButtonPreferenceControllerTest
Test: atest com.android.settings.notification.modes
Change-Id: Id018d360c648dd948d2f950ca67cfbea71cc5c68
2024-05-28 13:17:43 -04:00
Guojing Yuan
854227055d
Merge "[CDM] Catch IllegalArgumentException when association is not found" into main
2024-05-28 16:48:37 +00:00
josephpv
7ef9c46afa
Private space auto lock on device restart during setup
...
After creation of private space value of auto-lock setting is explicitly
set to lock on device restarts. Just before the end of the setup flow
the auto-lock setting is changed to auto-lock on device lock before the
last screen of private space setup.
Bug: 342398315
Test: atest PrivateSpaceMaintainerTest
Change-Id: I8eeb0058c7ecb31d6e30b4cc78ec5877ed316f75
2024-05-28 16:27:09 +00:00
Yining Liu
3e46f1f1c9
Merge changes I081a35c8,I8a84f688,I60b64a0c into main
...
* changes:
Clean un-used code for notification cool down
Add tests for updating Settings Page for Avalanche Suppression
Update Settings Page for Avalanche Suppression
2024-05-28 15:55:14 +00:00
Treehugger Robot
0dca9f78c5
Merge "Fix Messages onClick." into main
2024-05-28 15:13:23 +00:00
Liahav Eitan
20c78149f0
Increase char limit for add_device_admin_msg
...
Flag: DOCS_ONLY
Bug: 333040579
Test: None
Change-Id: I46c757f8700ee0ab168a1f68e4213f24f44aacd0
2024-05-28 14:53:09 +00:00