Commit Graph

138932 Commits

Author SHA1 Message Date
Josh Hou
3c38a12347 Aggregation checkbox and locale text
Refer to other settings with the checkbox to read the checkbox and corresponding text together, such as "Erase SIMs" or "Show password" in WiFi settings.

Bug: 288223637
Bug: 317927064
Test: Perform some accessibility test like TalkBack and Select to Speak
Change-Id: I571fe3f2f8d7b6b4f4c7b5804d0217a2a2b97757
2024-03-26 03:19:19 +00:00
Bill Yi
42be6f6e88 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-15 20:23:43 +00:00
Bill Yi
1732b38eda Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-15 20:23:43 +00:00
Bill Yi
e82472d6f5 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-15 20:23:43 +00:00
Treehugger Robot
71ebe0f959 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e80fe88947 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588535

Change-Id: I970433d9e624039d5e8757085b983429384de349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 17:09:32 +00:00
Bill Yi
f69c8e50b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1bfd1f0420 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588535

Change-Id: I08915d5d5f8c54278f2e65ab6715ebedd2a9ac20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 17:09:28 +00:00
Treehugger Robot
58f996238b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ca8f823c87 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588534

Change-Id: I11d675974eb806d88048e5adff7007317b40c0a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 17:09:23 +00:00
Bill Yi
a3a25757cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b999a848db -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588534

Change-Id: I938414220cd83b91ffb9e20dcbfac1ea4e32ed0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 17:09:09 +00:00
Manish Singh
3b4e29e68d Merge "Return my user id" into main 2024-03-15 16:55:36 +00:00
Treehugger Robot
e80fe88947 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-03-15 16:49:43 +00:00
Treehugger Robot
ca8f823c87 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-03-15 16:49:43 +00:00
Bill Yi
706902fbca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 697dfd9269 -s ours
am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26588532

Change-Id: I614c69886dadab01e1438f30929c11db9970cb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 16:47:43 +00:00
Chaohui Wang
ab1cf4ccad [automerger skipped] New countryIfOriginLabel am: 67579d564b -s ours
am skip reason: Merged-In I0b8851da20face9ca444b3e6456a4a662b944b65 with SHA-1 87318b10cd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26593648

Change-Id: I0f1d791ad7c734a2833a046f703a3a59d0c74b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 16:21:39 +00:00
Treehugger Robot
6b6aa30bdc Merge "[i18n] Fix tests for RegionalPreference and TickButtonPreference" into main 2024-03-15 14:02:43 +00:00
Prince Donkor
5f35b28015 Merge "Toggle Home controls when user selects Home Control Panel Dream" into main 2024-03-15 13:35:08 +00:00
Zoey Chen
22da08d8b9 Merge "[ToA] New string for title and summary" into main 2024-03-15 12:32:47 +00:00
Manish Singh
20b7cdcda8 Return my user id
Since the current context is the correct one, we can simply return
myUserId - just like for the managed profile.

Bug: 329784721
Test: manual
Change-Id: Ifbc13b0d87ba7b06c6d04c3442bbac0580c4cf3e
2024-03-15 12:25:51 +00:00
Allen Su
4e8b442383 Merge "[ToA] Move IO to background thread" into main 2024-03-15 10:49:58 +00:00
Zoey Chen
fe5e153a12 [i18n] Fix tests for RegionalPreference and TickButtonPreference
Bug: 329808623
Test: atest TermsOfAddressNotSpecifiedControllerTest
Test: atest TermsOfAddressFeminineControllerTest
Test: atest TermsOfAddressNeutralControllerTest
Test: atest TermsOfAddressMasculineControllerTest
Test: atest FirstDayOfWeekItemListControllerTest
Test: atest TemperatureUnitListControllerTest
Change-Id: I8f00e423799be75a222078247116558f3bb6b34b
2024-03-15 10:20:20 +00:00
Treehugger Robot
cef373c705 Merge "Support Private Space in battery usage." into main 2024-03-15 09:46:38 +00:00
Chaohui Wang
67579d564b New countryIfOriginLabel
And display this label as fallback when Regulatory Image is missing.

Bug: 329378943
Test: manual - on SIMs
Test: unit test
Change-Id: I0b8851da20face9ca444b3e6456a4a662b944b65
Merged-In: I0b8851da20face9ca444b3e6456a4a662b944b65
2024-03-15 09:23:31 +00:00
Chaohui Wang
167f9d4166 Merge "New countryIfOriginLabel" into main 2024-03-15 08:46:14 +00:00
Zoey Chen
218402a3c3 [ToA] New string for title and summary
Bug: 329792136
Test: manual
Change-Id: Ibbdba4c99d4b42b0cd88a144a96779b13e2401e1
2024-03-15 08:18:35 +00:00
Joseph Vincent
f2f44f50de Merge "Add entrypoint for Learn More in PS settings & Setup intro" into main 2024-03-15 07:39:16 +00:00
Chaohui Wang
87318b10cd New countryIfOriginLabel
And display this label as fallback when Regulatory Image is missing.

Bug: 329378943
Test: manual - on SIMs
Test: unit test
Change-Id: I0b8851da20face9ca444b3e6456a4a662b944b65
2024-03-15 15:25:55 +08:00
Allen Su
bb62c74bda [ToA] Move IO to background thread
Bug: 295826542
Bug: 312324895
Test: atest TermsOfAddressNotSpecifiedControllerTest, atest
TermsOfAddressNeutralControllerTest, atest
TermsOfAddressMasculineControllerTest, atest TermsOfAddressFeminineControllerTest

Change-Id: I45808815401f2caa24ffc03d634a4b2c90dfd55e
2024-03-15 07:23:34 +00:00
mxyyiyi
c9e8b8a011 Support Private Space in battery usage.
- Use database cache for single-user single-profile
- Reload battery usage info in other cases

Bug: 299032923
Test: manual
Change-Id: I5e524a094422639eedbf6e07eda498f3f72fccae
2024-03-15 11:13:34 +08:00
Chaohui Wang
67bfb4141f Merge "Fix simOnboardingLabelSimImpl_showItem_show3Items" into main 2024-03-15 03:08:22 +00:00
Chaohui Wang
18aa0c353c Merge "Filter out empty phone number" into main 2024-03-15 03:08:16 +00:00
Bill Yi
1bfd1f0420 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2d955ca0dd6ab4878101c7d5e5530c442321e07a
2024-03-14 16:20:51 -07:00
Bill Yi
03c1d99be8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5ee7c70a0de226aaf6a5e8407fbbf5bbfc8ffa78
2024-03-14 16:20:00 -07:00
Bill Yi
b999a848db Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie8edf822fef942eba3121432d6ee09f8a298d804
2024-03-14 16:17:56 -07:00
Bill Yi
a48bdbdee2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1134a8f7e59620c1a4920004e090254fa5803073
2024-03-14 16:16:08 -07:00
Bill Yi
911f873056 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib5914f41d9dbf69fefb24dee297fb9844439a495
2024-03-14 16:13:54 -07:00
Bill Yi
697dfd9269 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96c5ccb5ea8c7c2cde497e39fc39ea0ea2f1746f
2024-03-14 16:12:20 -07:00
Yu Liu
b4f24809eb Merge "Add missing container field to the aconfig flag file." into main 2024-03-14 19:27:03 +00:00
Ang Li
4e3f228219 Merge "Update the screenshot of Settings RNG tests." into main 2024-03-14 17:47:11 +00:00
Yu Liu
493126c54e Add missing container field to the aconfig flag file.
Bug: 328823994
Test: CI
Change-Id: I40e50c1c8571c1c88e7f8f582cf4e1155af713fd
2024-03-14 17:41:28 +00:00
Marcus Ge
a333d6ddfe Merge "[Accessibility] Address UX comments for the contrast screen" into main 2024-03-14 15:55:17 +00:00
marcusge
bec24a6393 [Accessibility] Address UX comments for the contrast screen
Bug: 241805782, 328475346
Test: atest, local raven device
Screenshot: attach on bug
Flag: aconfig
com.android.settings.accessibility.enable_color_contrast_control

Change-Id: I5177bad1d02769767b548b9405a9d723c1b3efeb
2024-03-14 15:52:53 +00:00
Ang Li
800ab6d4cb Update the screenshot of Settings RNG tests.
The screenshot updates comes from two sources:
1. A recent Robolectric library change;
2. The application of Material You Colors.

Test: http://ab/I77900010255425277
Change-Id: I0493b9970a55422ac5302daec6b44a71174c1fde
2024-03-14 10:08:18 +00:00
Olivier Nshimiye
a4babe7463 Merge "Add enable_private_space_features flag check for Private Space implementation" into main 2024-03-14 09:48:27 +00:00
Haijie Hong
ebeb92a4d7 Merge "Remove volume plus flag in Settings" into main 2024-03-14 09:44:07 +00:00
Chaohui Wang
d85494bd0c Filter out empty phone number
Prevent flicker.

Bug: 318310357
Test: manual - on SIMs
Test: unit test
Change-Id: Ie44ec8bad58b59368099d0fe3f277c12855f8bd4
2024-03-14 17:42:34 +08:00
Chaohui Wang
307c2e995c [automerger skipped] Update the summary when Wi-Fi calling ready am: bfb4086689 -s ours
am skip reason: Merged-In Ida94fd0a86f2130b9f0dded82fe18efd3ffc0c27 with SHA-1 d48cf866d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26576528

Change-Id: I1d8b918b0c997071e0fa93c1ba033afbe2531f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 07:49:13 +00:00
Chaohui Wang
bfb4086689 Update the summary when Wi-Fi calling ready
Since the correct summary can only be got after Wi-Fi calling ready.

Fix: 325414275
Test: manual - on Mobile Settings
Change-Id: Ida94fd0a86f2130b9f0dded82fe18efd3ffc0c27
Merged-In: Ida94fd0a86f2130b9f0dded82fe18efd3ffc0c27
2024-03-14 15:11:40 +08:00
Kangping Dong
b0c7563cdf Merge "[Thread] use dedicated flag for Thread settings" into main am: 33722b512a am: c19a1094d7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3002558

Change-Id: I1c28a4a870b8ded5aad1b32e1e4e7f505d580138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 06:19:07 +00:00
Alex Li
5d5f125c0a Merge "[Seamless] Adjust background color for wifi dialog in SUW flow." into 24D1-dev am: 18d6b02162
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26562546

Change-Id: Idf6b5571f64b214f709ba364a434afde28c93f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 06:05:58 +00:00
Chaohui Wang
1377e554df Fix simOnboardingLabelSimImpl_showItem_show3Items
Bug: 318310357
Test: unit test
Change-Id: I189f71d49a866660a1055576b39841db09fa1520
2024-03-14 14:05:48 +08:00
Kangping Dong
c19a1094d7 Merge "[Thread] use dedicated flag for Thread settings" into main am: 33722b512a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3002558

Change-Id: Ib9b4e1dde74dd45f93771ead002fa3bd830ca49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-14 06:00:53 +00:00