SongFerng Wang
0cc20946c8
Merge "Add metricsCategory for dualsim and apnEdit" into main
2024-06-14 09:25:47 +00:00
Treehugger Robot
fbf3403f8d
Merge "Reenable all tests for SettingsRoboTests" into main
2024-06-14 08:52:33 +00:00
chelseahao
f6b235746d
[Audiosharing] Add tests.
...
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: I6322ccbb5deffe2bc169a898ef0208e135caa819
2024-06-14 08:48:17 +00:00
chelseahao
8a8c89a49c
[Audiosharing] Add logging 3.
...
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: Idc96c23d20041a00d4fb1e20a7457baaa0f55527
2024-06-14 08:47:55 +00:00
songferngwang
f462b0278d
Fix test case failed
...
Bug: 342830152
Test: run atest SettingsUnitTests:com.android.settings.network.NetworkProviderCallsSmsFragmentTest
Change-Id: I4c3b065995de0b6c9935c34644d1f9fa47357749
2024-06-14 08:16:00 +00:00
Matías Hernández
e3570eb633
Merge "Load zen mode type icon options from the proper resources" into main
2024-06-14 08:10:59 +00:00
Tom Hsu
e05b699b04
Merge "Prevent crash when fragment lifecycle is after onStop" into main
2024-06-14 07:56:17 +00:00
Fan Wu
595ed9645e
Reenable all tests for SettingsRoboTests
...
Updating tests in development/ due to ag/27774179
Temporarily ignore tests in UserDetailsSettingsTest due to ag/27785999
Bug: 347125800
Test: atest
Change-Id: Iaed79c3fde80f5b2c31754bef4a93546813444a8
2024-06-14 07:27:31 +00:00
Joseph Vincent
f3b59755b4
Merge "Scale PS space animations to display on tablet" into main
2024-06-14 07:16:43 +00:00
Yiyi Shen
2c6b9bb364
[Audiosharing] Increase audio sharing test coverage
...
Bug: 345686602
Test: atest
Change-Id: Iec196fc884c3b7ddd580eb8dd13b445d59e3b1b7
2024-06-14 14:30:14 +08:00
tomhsu
b4108cb17e
Prevent crash when fragment lifecycle is after onStop
...
Fix: 325059602
Test: build pass
Change-Id: Ie132b4fd6b6c7df8c0fe188e0eb238f562fd4d6e
2024-06-14 06:02:14 +00:00
songferngwang
d73f0e3c77
Add the timer for waiting sim ready
...
When the sim onboarding setup the primary sim,
the psim is not ready.
Bug: 346623465
Test: verified this case.
Change-Id: Ide5a5de4f19deb7de6dd093df4dd267329b82046
2024-06-14 05:29:22 +00:00
Treehugger Robot
b3aae5aaf1
Merge "Don't show the Wi-Fi icon when Wi-Fi is off" into main
2024-06-14 03:58:01 +00:00
songferngwang
d4e467ed4a
Add metricsCategory for dualsim and apnEdit
...
Bug: 347091697
Test: Build pass
Change-Id: I783a45269112d91d79c00af41c0052ba488603d2
2024-06-13 23:00:29 +00:00
Bill Yi
02ad59a221
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4db6678bb8e03bcba5ca010165fc247f2689d3ee
2024-06-13 14:48:04 -07:00
Bill Yi
5d771a4760
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I67dec21c29fa5001e57d712109d66e98ac3bae9b
2024-06-13 14:46:13 -07:00
Treehugger Robot
66aa660ad5
Merge "fix(high text contrast): revert name back to "High Text Contrast"" into main
2024-06-13 21:22:58 +00:00
Tyler Freeman
40efef2210
fix(high text contrast): revert name back to "High Text Contrast"
...
We're holding off on launching High Contrast Text improvements,
so we're reverting back to the original name to avoid user confusion.
We'll save the name change for when we change the appearance of the
feature.
Bug: 344028969
Flag: ACONFIG com.android.settings.accessibility.enable_color_contrast_control NEXTFOOD
Flag: ACONFIG com.android.graphics.hwui.flags.high_contrast_text_small_text_rect STAGING
Test: manual
Change-Id: Icadf1b708b42f684b0d93a59bb7ff8dab26807dd
2024-06-13 19:37:13 +00:00
josephpv
f1a16e4147
Scale PS space animations to display on tablet
...
Screenshots:
b/336235352#comment10
Bug: 336235352
Test: Manual
Change-Id: I05c97756d788d58cd8d553317d3173b8a250348d
2024-06-13 18:47:48 +00:00
Xin Li
ef55516656
Merge Android 14 QPR3 to AOSP main
...
Bug: 346855327
Merged-In: If518bbb88342ae4c2e5e9f131727de58446be780
Change-Id: I4384e446922d66808c73cbf52627f2e8db7fa7af
2024-06-13 10:50:27 -07:00
Natnael Belay
10c4f84852
Merge "Temporarily ignore 2 ApnEdit tests" into main
2024-06-13 16:49:25 +00:00
Joseph Vincent
bfc9678d08
Merge "Update strings in PS setup education and settings screen" into main
2024-06-13 14:22:50 +00:00
josephpv
ce8a258b98
Update strings in PS setup education and settings screen
...
With this change strings in PS settings screen and PS setup education
screen footer is updated to include medical apps.
Screenshot:
go/ss/54VdL8mNvDXGCF4.png
go/ss/9XEAXLkGZa5KLDF.png
Bug: 346925554
Test: Manual
Change-Id: Ief39d92d27099d285f0e36394b9b41700a3d62d3
2024-06-13 14:22:16 +00:00
Alexander Roederer
a6b1d7cbbc
Adds summary helper for apps subtitle
...
The subtitle for the apps page says which apps (up to two/three) and how
many (if there are more than three) are allowed to bypass dnd under the
main "Apps" page.
Bug: 308819928
Test: atest ZenModesSummaryHelperTest
Flag: android.app.modes_ui
Change-Id: I15696384c392ba3f054948db50eea614f91d8c48
2024-06-13 13:20:29 +00:00
Weng Su
3b161c23b3
Don't show the Wi-Fi icon when Wi-Fi is off
...
- Show an empty icon when the Wi-Fi level is unreachable
Bug: 339343274
Flag: EXEMPT bugfix
Test: Manual testing
atest -c SettingsRoboTests
Change-Id: I55f3be145150235b19484e256c35e37f885a1dcf
2024-06-13 20:43:40 +08:00
Matías Hernández
22c325a099
Load zen mode type icon options from the proper resources
...
* Move default mode icons from Settings res to core res.
* Add array resources for the icon options and their descriptions.
* As the initial version of the list, use the default mode icons.
Bug: 333901673
Test: atest IconOptionsProviderImplTest
Flag: android.app.modes_ui
Change-Id: I66669e67a9d607268c05d5ed3df6c9555e57864c
2024-06-13 14:38:51 +02:00
Chelsea Hao
484d129b35
Merge "Catch NoSuchMethodError as isAutoOnSupported
is tagged as FlaggedApi
." into main
2024-06-13 11:44:48 +00:00
Treehugger Robot
50ee61a80f
Merge "InternetPreferenceController V2 (7/7)" into main
2024-06-13 10:05:19 +00:00
Olivier Nshimiye
2dc4310630
Merge "Remove settings tasks on private space deletion" into main
2024-06-13 09:47:49 +00:00
Matías Hernández
2bdd13fd26
Merge "Follow-up improvements to zen mode icon picker" into main
2024-06-13 09:28:24 +00:00
Chelsea Hao
4826efcbbf
Merge "[Audiosharing] Add logging 2." into main
2024-06-13 08:56:59 +00:00
Chelsea Hao
ba98450a2d
Merge "[Audiosharing] Add logging 1." into main
2024-06-13 08:56:35 +00:00
Fiona Campbell
21c0dd70ae
Merge "Even Dimmer for manual screen brightness mode" into main
2024-06-13 08:50:20 +00:00
chelseahao
c03df5f6c7
Catch NoSuchMethodError as isAutoOnSupported
is tagged as FlaggedApi
.
...
Test: Manual
Bug: 346716614
Change-Id: I69b34c461ab71703490147a49f5c713a25275f51
2024-06-13 08:47:49 +00:00
Chaohui Wang
b0acf0daf5
InternetPreferenceController V2 (7/7)
...
Support alternateSummary for HotspotNetworkEntry.
Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I6a454e86453ea8ed597a032d3f5769b6cf9102ba
2024-06-13 16:47:01 +08:00
Chaohui Wang
8dd270c0ea
Merge changes Ie14c36f0,I73fc9334,Ic06b0e34 into main
...
* changes:
InternetPreferenceController V2 (6/n)
InternetPreferenceController V2 (5/n)
InternetPreferenceController V2 (4/n)
2024-06-13 08:15:22 +00:00
Chaohui Wang
52d15b6c34
InternetPreferenceController V2 (6/n)
...
Treat carrier merged Wi-Fi as cellular.
Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ie14c36f0f22c332319c097150b06cfeec97e946f
2024-06-13 15:08:22 +08:00
Joseph Vincent
8e103fc4fd
Merge "Add accessibility delegate and populate itemCount" into main
2024-06-13 05:39:33 +00:00
Chaohui Wang
c5cc30f0c3
InternetPreferenceController V2 (5/n)
...
Support ethernet.
Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I73fc9334379daa979f736fc9ff31c3d576a3381b
2024-06-13 13:29:13 +08:00
Chaohui Wang
0d758dfdb9
InternetPreferenceController V2 (4/n)
...
Display different icon for different condition.
Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: Ic06b0e349a284f8b4466bd0c19f318a6a0936a6e
2024-06-13 13:29:13 +08:00
Chaohui Wang
585727a34a
Merge "InternetPreferenceController V2 (3/n)" into main
2024-06-13 05:24:51 +00:00
Chelsea Hao
dd494e68d2
Merge "Update auto on text." into main
2024-06-13 03:39:52 +00:00
Julia Reynolds
162813cd5a
Merge "Support device effects for manual mode" into main
2024-06-12 23:29:59 +00:00
Treehugger Robot
5d512f2c52
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3
am: d0f5ccb499
-s ours am: 20f8ad98fb
-s ours am: 357d9ecbdb
-s ours am: 506fc66f7c
-s ours am: 1120050213
-s ours am: 352bcbcbc4
-s ours am: e9842d18db
-s ours am: 8b3026b2b0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I1189c8eb8d46ab24c44988f1dae35bcdf7c66042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-12 21:34:26 +00:00
Jason Chiu
71bc19b212
[automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274
am: d0a4db88bb
-s ours am: e0b4c24d20
-s ours am: 8e61964dec
-s ours am: 23bcaf74e8
-s ours am: a01c5efd63
-s ours am: 7efa1c8090
-s ours am: 8666ed7ac1
-s ours am: 1edc91a76b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: Id922679bbeba85e6c4a156b48c60f93f2ca4bfd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-12 21:34:21 +00:00
Treehugger Robot
54565cdbb8
[automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d
am: a339d8ea9a
am: ffb480aee4
am: ba599569fd
-s ours am: ebefb83789
-s ours am: ebf3f4cee6
-s ours am: 915d38372e
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008
Change-Id: Ib1485864df8e23fa821b21af735b10a70f2dc380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-12 21:34:06 +00:00
Treehugger Robot
770ab5fdd1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3
am: d0f5ccb499
-s ours am: 20f8ad98fb
-s ours am: 357d9ecbdb
-s ours am: 5e90b5cfbb
-s ours am: ef935895f9
-s ours am: b1cdb2abae
-s ours am: d3c697bd8d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I9cab800926fb71255002d3abc6efd198a0313c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-12 21:33:50 +00:00
Jason Chiu
373daafcec
[automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274
am: d0a4db88bb
-s ours am: e0b4c24d20
-s ours am: 8e61964dec
-s ours am: 19019740e0
-s ours am: 2e2afe97df
-s ours am: e28d3aaa38
-s ours am: 20c8698884
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: If3277f35cb25c0e5c3baccc7b8b1c7e24e33e7f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-12 21:33:45 +00:00
Treehugger Robot
f103ae929f
[automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d
am: a339d8ea9a
am: 9e311f362a
-s ours am: 4c59ec6eaf
-s ours am: 296a7877e9
-s ours am: 1d5135af02
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008
Change-Id: Ib78b3e6f1559b0923bb0d22f1f28b487fa6ef201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-12 21:33:31 +00:00
Treehugger Robot
06c9461e42
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3
am: d0f5ccb499
-s ours am: 20f8ad98fb
-s ours am: 357d9ecbdb
-s ours am: 506fc66f7c
-s ours am: 1120050213
-s ours am: 352bcbcbc4
-s ours am: ba400e5833
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I279da4bda0e72ca3abfd3bfac9d41f0258e03b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-12 21:13:01 +00:00