Kevin Chyn
f6f13b578e
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
am: cd2016c7a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ibcdd4ad0a07289379c7a468ecc339422481389e1
2021-09-08 08:51:44 +00:00
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
TreeHugger Robot
a5cc9839c2
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814
Change-Id: Ibb65b7999bdc331c4b15363bce71ece51a448c0e
2021-09-08 08:09:04 +00:00
TreeHugger Robot
b370bfe77d
Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev
2021-09-08 07:57:33 +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
Presubmit Automerger Backend
948aadcfa4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
am: 77e02cbb71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I9335ae0dbecdbdb71cbbd1955bc57f6dabf9aa7a
2021-09-08 03:59:12 +00:00
Bill Yi
7fc6f84bb9
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I47cbb350d9c0ab717293fca603684fbd1c5b3f03
2021-09-08 03:52:05 +00:00
Presubmit Automerger Backend
d83a1eb34f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
am: 5d2b55f56c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: Iad50a5dab73a9aa2d4c4bbcf6a0ca76055ef2948
2021-09-08 03:52:04 +00: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
Bill Yi
47bb70329b
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
Import translations. DO NOT MERGE ANYWHERE
2021-09-08 03:43:33 +00:00
SongFerng Wang
9354a7e81c
Merge "[VoNR] VoNR settings" into sc-qpr1-dev
2021-09-08 03:38:02 +00:00
Presubmit Automerger Backend
5d2b55f56c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I8a830a6f59d79a8c663e61240fe9072d5c07891d
2021-09-07 23:51:49 +00:00
Presubmit Automerger Backend
77e02cbb71
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I82346cae7ca0fe69c3ad76815a9becf036c38ba2
2021-09-07 23:51:48 +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
TreeHugger Robot
ec9a292393
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev
2021-09-07 20:29:33 +00:00
Julia Reynolds
60dd5ef026
Remove unneeded NEW_TASK am: 717e3f6270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: I8f1564b6206d52fca34e510d41e772dcce4ed150
2021-09-07 18:51:32 +00:00
Julia Reynolds
717e3f6270
Remove unneeded NEW_TASK
...
To improve animations
Test: manual
Fixes: 197609584
Change-Id: I4cfbe7386014ba1fb6808bfeb283955101c7e1a7
2021-09-07 17:08:41 +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
3e32235ad3
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I5b07fbf557c04ac2cb5f39a07a157046f1079d43
2021-09-07 04:47:13 +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
0cf4e6393f
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
am: a9c1fa626b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Change-Id: Ic1acdad9cbe161b9f2aa5fa72bc569505bb66317
2021-09-05 03:48: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
8bca5db8d3
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
am: c1b136b503
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Change-Id: I1cbf1709e0a934874d41ff4def45d806e1f36ae8
2021-09-04 23:24:47 +00: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
5978ae7c3b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours am: 790491bc0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I9eddac69d363aae3ccd8bcc88cd43418066b477b
2021-09-03 20:57:59 +00:00
Bill Yi
f4368a3a41
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d
-s ours am: e49c8b9929
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: Iaad4618eab571c26603c6b0070bea4d30ed0de11
2021-09-03 20:57:55 +00:00
Automerger Merge Worker
eea7ed8ba2
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours am: e183f5a054
-s ours" into sc-qpr1-dev-plus-aosp
2021-09-03 20:57:34 +00:00
Bill Yi
cfa2baf197
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours am: e183f5a054
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I2ae81087d4799078266bf773ecf8e2052e12eb19
2021-09-03 20:57:32 +00:00
TreeHugger Robot
7c189c31fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50
-s ours am: 20a3a9ac3d
-s ours am: 0c0b1bf900
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748124
Change-Id: Iad35c50c9031283d3d8f6bfdbd0e784ec0bffc67
2021-09-03 20:57:31 +00:00
Bill Yi
ec8b0cc8ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d
-s ours am: a4512d2431
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I71305eb53cd4a496c0bc5a281cf58cb709d87a8d
2021-09-03 20:57:24 +00:00
Bill Yi
61af3ca025
Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I0c4ebf5f1ddc29321e473eeb8147dcc6e569a3fe
2021-09-03 20:57:06 +00:00
Bill Yi
08d52721f9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
am: 914dc714a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: Iae70243bc2627f6a5947c02f3f6dd8b706cf1ca4
2021-09-03 20:57:05 +00:00
TreeHugger Robot
977c1d696d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50
-s ours am: 20a3a9ac3d
-s ours am: 871ba0bacd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748124
Change-Id: I723b3bc16316fa8a3e84788763171f2a25f66338
2021-09-03 20:56:13 +00:00
Bill Yi
790491bc0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I2fff9127a356f4942996e07da5ecc57d9b60bd92
2021-09-03 20:56:02 +00:00
Bill Yi
f51b63cfb0
Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I16f4670c8a3fdaa8b3bc06bfa6d4dbf712c6b210
2021-09-03 20:56:02 +00:00