vichang
b9bebd5bd9
Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd
am: e6bf1a83d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314
Change-Id: If94d8a65c9902180466481f157224a5389d9b117
2021-09-21 11:06:23 +00:00
vichang
e6bf1a83d8
Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314
Change-Id: I458bf767bbea8b5921f00afae884d309d270f7b0
2021-09-21 10:52:53 +00:00
vichang
3166166bdd
Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest"
2021-09-21 10:42:27 +00:00
Jason Hsu
eb7a8bbe96
Merge "Use the correct pageId for the existing accessibility page" into sc-v2-dev am: e9cea6a4aa
am: 22015ac5c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785738
Change-Id: If732f5f62ee0d16932bb5f740cc0744f69db027c
2021-09-21 10:31:49 +00:00
Jason Hsu
22015ac5c5
Merge "Use the correct pageId for the existing accessibility page" into sc-v2-dev am: e9cea6a4aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785738
Change-Id: Ib0fc4934d24e08086fa8fb50e86c302750d783d4
2021-09-21 10:16:36 +00:00
Jason Hsu
e9cea6a4aa
Merge "Use the correct pageId for the existing accessibility page" into sc-v2-dev
2021-09-21 09:59:58 +00:00
Curtis Belmonte
54702ead67
Support configurable multi-stage UDFPS enrollment
...
Implements multi-stage enrollment for UDFPS. This implementation
supports both highlighting the progress bar when a help message is
received and configuring the progress thresholds between enroll stages
via an XML resource.
Test: Manual
Bug: 198928407
Bug: 200076382
Change-Id: Ied4dbcb4a523f477c5ca1a9146d24751c6473f35
Merged-In: Ied4dbcb4a523f477c5ca1a9146d24751c6473f35
2021-09-20 22:44:48 -07:00
TreeHugger Robot
c68e06fdbc
Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
am: 949b349912
am: 437ed9fa46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730
Change-Id: Ibff2a7dff1c74d2e8e4739cdf42f4e01d8fc359c
2021-09-20 20:04:35 +00:00
TreeHugger Robot
3a05fe9a27
Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
am: a82b6cd01e
am: 654c3279f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730
Change-Id: Id60ea0af94823c55ed56177574ce42da486a60eb
2021-09-20 20:04:23 +00:00
TreeHugger Robot
437ed9fa46
Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
am: 949b349912
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730
Change-Id: I9d84b1a416705b30a8cca09b16a08bd84c35db8e
2021-09-20 19:54:01 +00:00
TreeHugger Robot
654c3279f9
Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
am: a82b6cd01e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730
Change-Id: I411ba36f37c5f9a79d47b9e27b60de6b44e3d62c
2021-09-20 19:53:04 +00:00
TreeHugger Robot
949b349912
Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730
Change-Id: Ie8392b9c08592411b5a7279459adb56da1698225
2021-09-20 19:42:05 +00:00
TreeHugger Robot
a82b6cd01e
Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730
Change-Id: I211127b96a7f675dcf7b907d261a19d1311b33ea
2021-09-20 19:41:51 +00:00
jasonwshsu
746f4d45f7
Use the correct pageId for the existing accessibility page
...
* correct page id for "Accessibility timeout" and "Select to Speak"
Bug: 190344664
Test: build pass
Change-Id: I3f6b2c389c1ca77e4d3fca3601915caa7a9dd6f8
2021-09-20 19:29:27 +00:00
TreeHugger Robot
9dbe775faa
Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev
2021-09-20 19:19:54 +00:00
TreeHugger Robot
962fd6b22e
Merge "Add the pairing string for CSIP supported device"
2021-09-20 16:19:11 +00:00
TreeHugger Robot
f0571a5e5b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: b65f46dce2
-s ours am: 2e1b4f12c0
-s ours am: d9015e0e70
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: I7b4c6a472a65128ee97d42343067b270e365067d
2021-09-20 15:11:41 +00:00
TreeHugger Robot
c3f5320225
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: 3fa671bab4
-s ours am: 3c18081292
-s ours am: 87cdc11a39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: I1bb0eed721fefa91f0410243655d558f3eebd265
2021-09-20 15:11:28 +00:00
Bill Yi
c8a5df72cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 79c2a1e72e
-s ours am: 610ee5240d
-s ours am: 1eb125f2b8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I47f2c3bc97eaaa2db18c221345ce54235527c074
2021-09-20 15:11:18 +00:00
TreeHugger Robot
88489e03a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: b65f46dce2
-s ours am: e860099488
-s ours am: 25a2a58fa2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: Ibbc2e48764f8255fa944247cf28379a17a8196b2
2021-09-20 15:09:55 +00:00
Bill Yi
216ce27f47
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 79c2a1e72e
-s ours am: 34bbccd412
-s ours am: 6ad471e64f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: Id5f3265650ce75df270a3e58b729cb664026fc26
2021-09-20 15:08:31 +00:00
Bill Yi
80e2f3e35d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 6280ce466c
-s ours am: 56578f0ea2
-s ours am: b5ab618a36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I15b69f11a9256466cabd01fa7544d5a20985cf19
2021-09-20 15:06:39 +00:00
TreeHugger Robot
d9015e0e70
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: b65f46dce2
-s ours am: 2e1b4f12c0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: Ib22874dfbb313ad153087a48b6834947c004880c
2021-09-20 15:01:02 +00:00
TreeHugger Robot
87cdc11a39
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: 3fa671bab4
-s ours am: 3c18081292
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: Id56f83a34ac65b2a7d4ae6c479d6f180389932e2
2021-09-20 15:00:46 +00:00
Bill Yi
1eb125f2b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 79c2a1e72e
-s ours am: 610ee5240d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I8881900b12a83e6561040f69b3d84369e486c518
2021-09-20 15:00:04 +00:00
TreeHugger Robot
25a2a58fa2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: b65f46dce2
-s ours am: e860099488
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: I09cf2a67c440dde9ca9e4fee25a082af17fb79f6
2021-09-20 14:59:16 +00:00
Bill Yi
6ad471e64f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 79c2a1e72e
-s ours am: 34bbccd412
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I950f4e11b6b37d14a9b72c2c40363cc6b558aab8
2021-09-20 14:58:47 +00:00
Bill Yi
b5ab618a36
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 6280ce466c
-s ours am: 56578f0ea2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I17af9bc7571c539ab40bac6813bbc64c935cea65
2021-09-20 14:57:43 +00:00
Victor Chang
fc4589448b
Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest
...
The time zone transitions can be obtained via the public API
ZoneId.getRules() instead.
Bug: 119751170
Test: atest SettingsRoboTests
com.android.settings.datetime.timezone.TimeZoneInfoPreferenceControllerTest passes
Change-Id: I2c7864580b2a36b725ee250253e97f6cc86d72a4
2021-09-20 15:57:42 +01:00
TreeHugger Robot
e860099488
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: b65f46dce2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: I8e0c0cc8b8fc1390510ee4bb22040eca634f1481
2021-09-20 14:45:17 +00:00
TreeHugger Robot
2e1b4f12c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: b65f46dce2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: I711c1899c421ab095616b208c4f67f0128967e5b
2021-09-20 14:44:46 +00:00
TreeHugger Robot
3c18081292
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: 3fa671bab4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: Ia2d4869b3f97a66f5697a3a6fcd706b9b6513669
2021-09-20 14:44:39 +00:00
Bill Yi
610ee5240d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 79c2a1e72e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: Ie796e678663113dd77dd81e57e6162ad9b14c1f8
2021-09-20 14:44:36 +00:00
Bill Yi
34bbccd412
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 79c2a1e72e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I3dea5f12e5769d7910f9cbd813b6e89c1a33afdc
2021-09-20 14:44:19 +00:00
TreeHugger Robot
c78cabf433
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours am: a1cce1a07c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: I9e8f98c4fc4402751f71b86cef01b4dbc6d2a8fa
2021-09-20 14:44:14 +00:00
Bill Yi
56578f0ea2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 6280ce466c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I1eaf564aee23c4a00d10204a8b9abce90160e374
2021-09-20 14:43:43 +00:00
Bill Yi
62cf39bc5e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours am: 6a926cd911
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: Ia30164f620be00d437b5ef290881fc206396b18e
2021-09-20 14:43:00 +00:00
Weng Su
caa29d401b
Minor change to Wi-Fi WPA3 password length restriction
...
- Change the maximum length limit to 128
Bug: 200305860
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: Ia739dab35da75c73e28077ccc81979253def6128
2021-09-20 22:38:29 +08:00
TreeHugger Robot
b65f46dce2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: Iee57b257fde74ff26a1f5761c999e71f9ee3c809
2021-09-20 14:30:15 +00:00
Bill Yi
79c2a1e72e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I0e3eaaf2db60a51fd7a6d7ea0a4f7366c036a147
2021-09-20 14:29:29 +00:00
TreeHugger Robot
3fa671bab4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: Iadbd3da5a10bed29a0988acf9c64fbb54614b451
2021-09-20 14:29:18 +00:00
TreeHugger Robot
a1cce1a07c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours am: 8fc132c073
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: I317762db18afedca19e671704654570d498852d1
2021-09-20 14:29:15 +00:00
Bill Yi
6a926cd911
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I0a9396bfd0bc8b4ace1cf50e27079797fd9314ed
2021-09-20 14:28:33 +00:00
Bill Yi
6280ce466c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours am: 977610714f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: I02500142f53249a3f17b775d14baca98c3c60a14
2021-09-20 14:28:32 +00:00
TreeHugger Robot
8fc132c073
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860614
Change-Id: If21bd8380189f5615c8531bab311cbb7847742d7
2021-09-20 14:16:53 +00:00
Bill Yi
977610714f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860615
Change-Id: Idc00c683438341c8024aa8050982745a71f32840
2021-09-20 14:16:34 +00:00
TreeHugger Robot
7a8b043da7
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-20 14:04:47 +00:00
Bill Yi
1c7af0a1cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-s ours am: 9440aa4378
-s ours am: c19d9c96c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ife4d1fb6a3fcf3eab2b0a110a9de96182d4c613a
2021-09-20 14:00:51 +00:00
Bill Yi
be1a8ee3a2
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
am: 82e2ee2a19
am: 82ff199ad6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I9655d1d0a848c5ab7a5cb99e37ae47315e5f7333
2021-09-20 14:00:39 +00:00
Bill Yi
352caddfd7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-s ours am: 2dda71d5a4
-s ours am: 1b62d44530
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ib0f7adcd818b29bbf67cc96d7660a3447357959f
2021-09-20 14:00:38 +00:00