Kevin Chyn
1b1c7ee277
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
am: 49bbd5b893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Icb0714151e308048598738e9a61607dc5361f6fe
2021-09-08 08:51:24 +00:00
Kevin Chyn
cd2016c7a0
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ief10091c6a8fed52e87ea0da33bf24c0bad34ce8
2021-09-08 08:26:47 +00:00
Kevin Chyn
49bbd5b893
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ie1964e499bc6a11499590de5a69f75539939ce3a
2021-09-08 08:25:40 +00:00
Kevin Chyn
0b40e09ba6
[DO NOT MERGE] Update enrollment edu asset
...
Bug: 198858684
Test: Build, enroll
Change-Id: I71dc7b20cd1e2f1805af3214e161feb1f2267ab6
Merged-In: Ic6e589ce738c8b1b82f892452518e4540a73f94b
2021-09-08 00:09:13 -07:00
SongFerng Wang
5bcabf3a78
Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579
Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
2021-09-08 03:51:39 +00:00
SongFerng Wang
9354a7e81c
Merge "[VoNR] VoNR settings" into sc-qpr1-dev
2021-09-08 03:38:02 +00:00
Bill Yi
d770312ec1
Import translations. DO NOT MERGE ANYWHERE
...
BUG:198847997
Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
2021-09-07 23:51:36 +00:00
TreeHugger Robot
fb39c456a8
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I5b8af0112efa816d38d08a9a84e10b9ebb016531
2021-09-07 20:42:23 +00:00
Julia Reynolds
520c80d649
Add 'snoozing' to NLS consent dialog
...
Test: manual
Bug: 195031401
Change-Id: I93226e89f033689d9731b6d3efd79bb9fdf628b4
2021-09-07 13:17:49 +00:00
Presubmit Automerger Backend
d7e50f20fe
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 585d501aff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I61d4f0aedc979e9d6d79c8035bf7e441e68c0e7b
2021-09-07 04:46:50 +00:00
SongFerngWang
eaa71ac6de
[VoNR] VoNR settings
...
Allow user to enable or disable voice over NR.
Bug: 191203577
Test: atest
com.android.settings.network.telephony.NrAdvancedCallingPreferenceControllerTest
Change-Id: I9be4716d0cdac5d698c2058be65bfa541495d012
2021-09-07 10:57:34 +08:00
Presubmit Automerger Backend
585d501aff
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: If065d05e56a573f40969fb780299099a38b548b0
2021-09-07 01:57:06 +00:00
Presubmit Automerger Backend
4dde18fc09
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: Ia1cb0bebbab85af8bda052e0c430527909949562
2021-09-07 01:57:04 +00:00
Curtis Belmonte
e7849fb0dc
RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment
...
Adds support for showing multiple stages during UDFPS enrollment:
1. Initial touch & center enroll
2. Guided enroll (or continued center enroll for a11y)
3. Fingertip enroll
4. Edge enroll
Test: Manual
Bug: 198858684
Change-Id: I6646db9038d236eca6d6d62e1c7ddf7649e4945e
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
2021-09-06 18:56:38 -07:00
Betty Chang
edd650f6b5
Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403
Change-Id: Ib0426da2b92a1c5771dffd2ff68618f14f331f44
2021-09-06 04:12:49 +00:00
Betty Chang
adc41a55d5
Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev
2021-09-06 04:00:59 +00:00
Curtis Belmonte
91cfb2c06c
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
am: 4f2f0ed6d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Change-Id: I5e527298abe4024bc5a8b1b42682e80a36c1e2a3
2021-09-05 03:48:42 +00:00
Curtis Belmonte
4f2f0ed6d5
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Bug: 198847997
Change-Id: Id730b3ccfada949186db2ab61046ee57ca0b82dc
2021-09-05 00:11:08 +00:00
Curtis Belmonte
a9c1fa626b
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Bug: 198847997
Change-Id: Ib88caa522f11d1be6bc3ef9479cfdefe4eabf10a
2021-09-05 00:11:06 +00:00
Curtis Belmonte
4592bf62a3
Update char limits for new UDFPS enroll strings
...
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.
Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
2021-09-04 17:08:01 -07:00
Presubmit Automerger Backend
39928c53fc
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
am: 8d82ccdc24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Change-Id: I6ea222460fa8c4653943e0c4bc73ea07bb1c2b52
2021-09-04 23:24:30 +00:00
Presubmit Automerger Backend
8d82ccdc24
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Bug: 198847997
Change-Id: I5ba1c5d10c85b1dec25f4f2438439924585d9c3b
2021-09-04 20:49:34 +00:00
Presubmit Automerger Backend
c1b136b503
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Bug: 198847997
Change-Id: Iaec5471868501824dbb0aa4cfe76feeff698133c
2021-09-04 20:49:34 +00:00
Curtis Belmonte
c84e18b253
Add new strings for UDFPS 4-stage enrollment
...
Adds strings that will be shown during the new tip and edge enrollment
stages of the UDFPS enrollment flow.
Test: Presubmit
Bug: 198847997
Change-Id: I11a9889ec0e5079c3531367bfa397a1910f42af6
2021-09-04 13:48:28 -07:00
Bill Yi
6178db1a47
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-03 20:35:13 +00:00
TreeHugger Robot
a64f9f261b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:47:06 +00:00
changbetty
8dec2efc67
Change the SIM color for passing the GAR
...
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
Merged-In: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-09-03 04:07:31 +00:00
Bill Yi
4a0398c888
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I76a03c3361848e96d981867535cb1c987ffc410f
2021-09-02 13:45:37 +00:00
Bill Yi
1336ffec20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1f957d47f370a5379c50a87a032f614ffb58ae76
2021-09-02 13:41:52 +00:00
Bill Yi
71904cfc78
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d02ac4cb07e74c28f89f88f0048068ac5ecfaba
2021-09-02 13:32:52 +00:00
Bill Yi
fb4f0b0820
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I00320830b2c3434b32e8db54606c9ec4291c6cf7
2021-09-02 13:31:17 +00:00
Bill Yi
31208c4948
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-29 20:09:43 +00:00
TreeHugger Robot
3575b70b77
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-28 08:02:29 +00:00
TreeHugger Robot
74b4a3c8fb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-28 08:01:49 +00:00
Bill Yi
4f31189088
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5227d933dcb559cb1be8bb5a0bbcce612b0da2a4
2021-08-27 22:34:10 +00:00
Bill Yi
483d6621f3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibe92bbdc1c48b03b289f618ec57204de1e5742ac
2021-08-27 22:30:19 +00:00
Bill Yi
e3d99cf9c6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I148b65f26df0f4c99f650bad6beef65918ae4870
2021-08-27 22:20:59 +00:00
Bill Yi
dbd589e440
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I96dd7efe4261508234fbb971a0d7e406d548a503
2021-08-27 22:19:26 +00:00
Victor Liu
1d35b1cd1b
Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887
Change-Id: Iee67208eb135484aca10ae7c17894713795d1544
2021-08-27 02:13:58 +00:00
Victor Liu
989edd731d
Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev
2021-08-27 01:57:14 +00:00
Android Build Prod User
0b8ff007b7
Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309
Change-Id: Ie0d087c70691e9363126c096625e9ee4aab44a63
2021-08-26 21:59:26 +00:00
Android Build Prod User
33af17ff31
Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev
2021-08-26 21:42:36 +00:00
Joy Babafemi
63976c2051
Revert "Revert "UWB: Re-enable UWB toggle""
...
This reverts commit 2e593b3784
.
Reason for revert: Root cause b/196317865 fixed
Bug: 197519749
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
Merged-In: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
2021-08-26 20:27:23 +00:00
Betty Chang
7e7b237092
Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537
Change-Id: I4bc6a5d4d5eeccaf23d4c7da0314ebdfaf4965e4
2021-08-26 02:06:50 +00:00
Betty Chang
6a3b697141
Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev
2021-08-26 01:50:56 +00:00
changbetty
b1b2da9aca
Change the Network preference summary for wifi option
...
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
Merged-In: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
2021-08-25 02:55:38 +00:00
TreeHugger Robot
e1a95327ea
Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132
Change-Id: I96c1c2cf4ae52d9fad6c0cdf7d4d20cba013e700
2021-08-23 17:42:50 +00:00
TreeHugger Robot
8e98df31a4
Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev
2021-08-23 17:28:43 +00:00
Bill Yi
0f61194307
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3ea6d77ccace207249eef5d86fc331f22db54dac
2021-08-21 10:49:31 +00:00
Bill Yi
93eb76377b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4c088fc157f34994615725c8c2e9815e174a6508
2021-08-21 10:45:59 +00:00