Chris Antol
03e59a0827
Merge "Ignore fragment attr from ext authenticator resource" into main
2024-06-05 02:01:07 +00:00
Joshua Mccloskey
b74153739a
Merge "Changed face/finger enroll intro no thanks" into main
2024-06-04 22:19:13 +00:00
Joshua McCloskey
c87a49fe69
Changed face/finger enroll intro no thanks
...
Changed the face & fingerprint enroll introduction to use "Not now"
instead of "No thanks" during enrollment.
Test: Manually verified the strings that showed up during
face/fingerprint enrollment were correct
Fixes: 302662735
Change-Id: I66183febae1cc36d4bfb2f67e70a3f37a887369c
2024-06-04 19:05:47 +00:00
Treehugger Robot
a91316d418
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a10b64bebd
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27662035
Change-Id: If9ea349e76aa87cf480173609eaed251236ab756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:41 +00:00
Bill Yi
0ee5bac2a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ce35a584c3
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27662035
Change-Id: If00bf2a36869b41af9d2a1824eede1beeabc43ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:34 +00:00
Treehugger Robot
33e7ed1759
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a380ca7e3d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661293
Change-Id: Ifdd8e2d66510504c924ad99fdc687d0b58a3d01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:31 +00:00
Bill Yi
cda5dae905
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cf00bfd93
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661293
Change-Id: I93f8fef4685c56f307a9b9a191e6543da7c90d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:22 +00:00
Bill Yi
f14a11e963
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb325d35d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661289
Change-Id: I006f4a157b3149c7e346c97bdadd44af478fe893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:18 +00:00
Treehugger Robot
b13e43b980
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: db26a77b37
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661146
Change-Id: Ib1d4d358a0d728adc1c92aee4290159a6590b607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:22:04 +00:00
Bill Yi
1877fbdc66
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 994dc22a81
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661146
Change-Id: I6e1687d0db7b57f7fed90552d5231d3463d484c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:21:58 +00:00
Bill Yi
5085a052c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53d3d950dc
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661777
Change-Id: If6f78bfd0803dad0c239169fd609b2ecaf5cc3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:21:07 +00:00
Treehugger Robot
a10b64bebd
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-06-04 18:12:07 +00:00
Treehugger Robot
a380ca7e3d
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-06-04 18:12:07 +00:00
Treehugger Robot
db26a77b37
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-06-04 18:11:48 +00:00
Nate Myren
d7de057fd2
Merge "Convert clipboard access to use new APIs" into main
2024-06-04 18:09:00 +00:00
Treehugger Robot
467962202e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-06-04 18:04:36 +00:00
Treehugger Robot
30299b5b51
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-06-04 18:04:36 +00:00
Treehugger Robot
1d6419f8c6
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-06-04 18:04:36 +00:00
Chun-Ku Lin
557659277f
Merge "Load icon in the background, also load extra data that would be used later in the background." into main
2024-06-04 17:16:23 +00:00
Chris Antol
2cb9b10ed9
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 17:06:26 +00:00
Yomna Nasser
23377dcf4c
Merge "Remove unneeded init & displayPreference functions" into main
2024-06-04 16:36:13 +00:00
Jason Hsu
b300ecff43
Merge "Update 'Preset' to singular" into main
2024-06-04 16:28:17 +00:00
jasonwshsu
452cfdc39d
Update 'Preset' to singular
...
Bug: 344832549
Test: check string in Device details page when pairing with hearing aids
Flag: EXEMPT resource only update
Change-Id: I11f892065131680723793f5ac652e11fce0b21ec
2024-06-04 21:14:49 +08:00
Chaohui Wang
7030928506
Merge "Finish mobile settings if sub id not exists" into main
2024-06-04 12:46:08 +00:00
YK Hung
855681fa8f
Merge "Fetch the original battery optimization mode in backup & restore process." into main
2024-06-04 10:28:37 +00:00
YK Hung
d76f5b8233
Merge "Fix post-comment in ag/27593647 to improve the readability." into main
2024-06-04 10:25:00 +00:00
Chaohui Wang
28f51a934a
Merge "[Apn] Copy network type into lingering network type" into main
2024-06-04 10:16:13 +00:00
Chaohui Wang
3ad527640e
Finish mobile settings if sub id not exists
...
Could be test with,
adb shell am start \
-a android.settings.NETWORK_OPERATOR_SETTINGS \
--ei android.provider.extra.SUB_ID 999
Bug: 336232487
Test: manual - on MobileNetworkSettings
Change-Id: I74d5d5b743c40375ceba1ba6e761da901d0d5e65
2024-06-04 18:15:24 +08:00
Chelsea Hao
035efe6207
Merge "[Audiosharing] Clean up unused code." into main
2024-06-04 09:35:38 +00:00
mxyyiyi
00507a47ec
Fix post-comment in ag/27593647 to improve the readability.
...
Bug: 338965652
Test: atest + manual
Change-Id: I8e4c8a4508dd8c5afd1f16c6129146ba6e13bde2
2024-06-04 15:48:36 +08:00
mxyyiyi
1767a6ebb8
Fetch the original battery optimization mode in backup & restore process.
...
- Battery optimization mode maybe temporary updated by turbo.
Bug: 338965652
Test: atest + manual
Change-Id: Ibea7ecc85ee7d042058f1bccc043fa501be2b8db
2024-06-04 15:43:58 +08:00
Xinyi Mao
d6fe83b86e
Merge "Fix color_hook broken in repo upload caused by ag/27381753." into main
2024-06-04 07:37:27 +00:00
chelseahao
4c94930ad5
[Audiosharing] Clean up unused code.
...
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: Iea1aede53aefe2034b5a083ff503bb21a4f546cb
2024-06-04 07:09:03 +00:00
Chaohui Wang
57956a8bb8
[Apn] Copy network type into lingering network type
...
The lingering network type is actually the bit that controls network
torn down. UNKNOWN here means the APN can work on any RAT.
Just copy network type into lingering network type, so network torn down
can work normally.
Fix: 341006308
Test: unit test
Change-Id: Ia60ad3e012bec7364aa35535de1363cd7c0ccdda
2024-06-04 13:58:36 +08:00
Treehugger Robot
70b0a36c4b
Merge "Modify the incorrect wording" into main
2024-06-04 05:11:19 +00:00
mxyyiyi
3a07663134
Fix color_hook broken in repo upload caused by ag/27381753.
...
Bug:344714906
Test: manual
Change-Id: I0d26fa6906830c0634ff2cff2d3265d9435c9dfb
2024-06-04 12:35:56 +08:00
Chun-Ku Lin
b9ee1c4877
Load icon in the background, also load extra data that would be used
...
later in the background.
Bug: 327052480
Test: atest com.android.settings.accessibility
Flag: EXEMPT bugfix
Change-Id: I9940772e60e2137aad2b3b70902565e36fb7aad6
2024-06-04 02:07:18 +00:00
Bill Yi
ce35a584c3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic9577977162782d0b73f5e0994d16cbaf6f95777
2024-06-03 17:37:28 -07:00
Bill Yi
66c320a850
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4b04977ab2f21cede81d1100787d16df9284ea20
2024-06-03 17:36:34 -07:00
Bill Yi
5cf00bfd93
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib477c1383411c839d396e784ff3295a783b6a52a
2024-06-03 17:34:18 -07:00
Bill Yi
6a65f16998
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I60a56a23573aef71014cde64af9eeca6addeb8b0
2024-06-03 17:32:25 -07:00
Bill Yi
5fb325d35d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icaccc6fdfa98168a78ddb6336ae00354812762ee
2024-06-03 17:30:51 -07:00
Bill Yi
bf17fe16a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I76ef7a226e3077feca39fe7404c7ab6fd423770c
2024-06-03 17:29:59 -07:00
Bill Yi
53d3d950dc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I73480046cd6ab5ac2a310f67e883a38ac75c8587
2024-06-03 17:28:19 -07:00
Bill Yi
994dc22a81
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I71d42c126dbc6be33ddf3447e6853ccd210fc3de
2024-06-03 17:26:47 -07:00
Chun-Ku Lin
ba408fbb06
[Refactor] Create a dedicated AccessibilityServicePreference and
...
AccessibilityActivityPreference to encapture the method for loading the
content for AccessibilityService and AccessibilityShortcutInfo
Bug: 327052480
Test: atest com.android.settings.accessibility
Flag: EXEMPT mechanical refactor
Change-Id: I698a1d366e8ab82c8efdcae293a1ba1771925121
2024-06-04 00:22:44 +00:00
yomna
a2f5b59014
Remove unneeded init & displayPreference functions
...
Bug: 330336498
Test: m & atest CellularSecurityNotificationsDividerControllerTest CellularSecurityNotificationsPreferenceControllerTest CellularSecurityEncryptionDividerControllerTest CellularSecurityPreferenceControllerTest
Flag: EXEMPT bugfix
Change-Id: I791ad88738da24916b2c48e9b24f404707fc7047
2024-06-03 22:41:25 +00:00
Treehugger Robot
59417f3737
Merge "Reenable (no longer) failing test" into main
2024-06-03 19:16:30 +00:00
Daniel Norman
5a20cfb469
Merge "Update A11ySettings to load preferences in onCreate()." into main
2024-06-03 19:06:23 +00:00
Julia Reynolds
15930b1b61
Reenable (no longer) failing test
...
Test: ApprovalPreferenceControllerTest
Fixes: 339550695
Flag: android.app.modes_api
Change-Id: Id71a17edd3fa1e9a03df3947c159161eee4dcd1a
2024-06-03 18:13:13 +00:00