vichang
e4ccdef15a
Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd
am: e6bf1a83d8
am: b9bebd5bd9
am: eca37a8849
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314
Change-Id: Ibcbd24530e7e94a2941d840701158457bbcde835
2021-09-21 11:31:11 +00:00
vichang
eca37a8849
Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd
am: e6bf1a83d8
am: b9bebd5bd9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314
Change-Id: Ie407f4d20b32fce153c2af8d17b65fda7725a6c8
2021-09-21 11:16:42 +00:00
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
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
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
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
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
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
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
c19d9c96c5
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ifadc29d28b1b4c6a55fc5f9695a074e35549f6de
2021-09-20 13:43:34 +00:00
Bill Yi
82ff199ad6
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
am: 82e2ee2a19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ie96faf70255322f537b8f270a444d5a4cf1e14fd
2021-09-20 13:43:29 +00:00
Bill Yi
1b62d44530
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-s ours am: 2dda71d5a4
-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: I091335e2e231f1f3f24fdc93aba7e5e7344e7515
2021-09-20 13:43:28 +00:00
Automerger Merge Worker
c0e89c29e6
Merge changes from topic "am-f6977f162413434b9b6d152bf7a8ae79" into sc-v2-dev-plus-aosp
...
* changes:
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
am: 488e676e07
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours am: b50c2b8618
-s ours
2021-09-20 13:43:24 +00:00
Bill Yi
9953aadfa5
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
am: 488e676e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I0705a1dfef63722cff672849b45c8c8daa2db666
2021-09-20 13:43:21 +00:00
Bill Yi
3352a113f0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours am: b50c2b8618
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: Ida15bc27882efb4c81cad953cceb8cb7ba3b7180
2021-09-20 13:43:19 +00:00
Bill Yi
7e6599c614
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-s ours am: 801bcbf545
-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: Ifc13ed6a3f0ee6a9853394dd8e9b7407c34762f0
2021-09-20 13:43:18 +00:00
Bill Yi
c07efa7cfa
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
am: 523f18b4eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ifb94c6620dc35fe6a94d3df361ba13c7ded63346
2021-09-20 13:43:12 +00:00
Bill Yi
561b78152e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-s ours am: dfbbc071c2
-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: I1ec7a5191ad513bfba68a14cc929de4d4a518616
2021-09-20 13:43:11 +00:00
Bill Yi
2e67fd2b8d
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
am: 5f9d29ac41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I94a33ea0836cd8d8767ce12535bb8d55cf0403fe
2021-09-20 13:43:05 +00:00
Bill Yi
7dcbfbd0d9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-s ours am: ae2e00e1d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: Ida492582a2d3265ab453094ff4aafd6843b19dca
2021-09-20 13:43:04 +00:00
Bill Yi
65992373b7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: 2cf7817de7
-s ours am: 78507d697d
-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: Icfee5270bc38a5372ec171486ea9189163515d70
2021-09-20 13:42:58 +00:00
Bill Yi
aa7a1362e2
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287
am: 24dabad62e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I30d247182b1fbfbee142eef5e5f80ccfa41099cb
2021-09-20 13:42:53 +00:00
Bill Yi
10f66958a3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 6c50635319
-s ours am: 39f5c07a46
-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: Iecad8a37cb6eaaa1f1cb996f300c48eb106be272
2021-09-20 13:42:52 +00:00
Bill Yi
a8bb61fd6a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 15c729b335
-s ours am: 7159a65e51
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I08ff54fe6b23a7de05276260eb921c4943be56e7
2021-09-20 13:42:34 +00:00