Bill Yi
2175bf57c6
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Ib8ed72738e0fcea0b63dc3e7ebb9d1f305e807f9
2021-09-23 17:54:54 +00:00
Bill Yi
464f75c26f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f6ce2ff37cea9e6f452bebb92b9cb78b844f3aa
2021-09-23 17:54:22 +00:00
Bill Yi
20df40e783
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia87ff5a7993ad94c6b9e910380d5b758dfb6363e
2021-09-23 17:49:59 +00:00
Bill Yi
6d56b2dce8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id60fd628884560576a270ab93f49a235cfc8b932
2021-09-23 17:46:38 +00:00
Alex Johnston
685cacb540
Fix USB tether option
...
* USB tether option will be grayed out before
USB cable is plugged in.
Bug: 192225597
Test: manual testing
Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
2021-09-23 16:05:29 +00:00
Tsung-Mao Fang
b57265fa31
Revert "Move Automatic System Updates from Developer Options to ..."
...
Revert submission 15552651-cherrypick-automatic-system-update-n9jr24y6ba
Reason for revert: Legal team decided to have this entry in GMS, so we can move this setting item back.
Reverted Changes:
Iaea3e11d9:Move Automatic System Updates from Developer Optio...
I077607a6a:Move Automatic System Updates from Developer Optio...
Change-Id: If000388f2dd0f9e3e06a29dcbdd362181d1bfd47
Bug: 196297425
2021-09-23 09:26:58 +00:00
Curtis Belmonte
e04555bc68
Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332
Change-Id: I0c658ef0ad208e912e88e2af82cf14d3ec34d245
2021-09-22 18:08:40 +00:00
Curtis Belmonte
491ef413c3
Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev
2021-09-22 17:52:47 +00:00
TreeHugger Robot
1fc8de7343
Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410
Change-Id: If671b194ea453ac406f280b5fdfe72d62cf1f550
2021-09-22 09:21:58 +00:00
TreeHugger Robot
85d20f5957
Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev
2021-09-22 09:08:25 +00:00
TreeHugger Robot
03f1947b2c
Merge "Minor change to Wi-Fi WPA3 password length restriction" into sc-qpr1-dev am: 6263fd9471
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860293
Change-Id: I4fd211c5e1bab04677aacda77728c732b7de89ca
2021-09-22 06:36:33 +00:00
TreeHugger Robot
6263fd9471
Merge "Minor change to Wi-Fi WPA3 password length restriction" into sc-qpr1-dev
2021-09-22 06:25:24 +00:00
Zoey Chen
ab18c8ac04
Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629
Change-Id: Iaa62b3be6f11eaa86b3d7b547f3e896e9bee5f9e
2021-09-22 06:06:57 +00:00
Zoey Chen
39b6769e5e
Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev
2021-09-22 05:53:36 +00:00
Joshua Mccloskey
8aeeb6cd45
Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923
Change-Id: Ib9d449b5e3b4565a6bad54141ccad8491bfb6630
2021-09-21 22:52:34 +00:00
Joshua Mccloskey
21ad438f6a
Merge "Updated settings preference title for work profile" into sc-qpr1-dev
2021-09-21 22:39:56 +00:00
Zoey Chen
95db7ae728
[Provider Model] The SIMs page should list all p-SIMs
...
- We do not support multiple pSIMs until now, so we need to get all p-SIMs from SubscriptionManager
- Apply same checking for downloaded sim
Bug: 199032142
Test: vendor test
Test: atest NetworkProviderSimsCategoryControllerTest and atest NetworkProviderSimListControllerTest
Change-Id: I77d7c52e73ac4e5d09fa3f3926490d7f8f8b0913
2021-09-21 17:29:27 +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
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
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
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
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
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
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
801bcbf545
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: bd4c0ff5eb
-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: Ie13bee53a99e19f0221392508abbc0ecb74423fb
2021-09-20 13:29:30 +00:00
Bill Yi
523f18b4eb
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: I1a29f9d44a44210065a8c259de323c41602b4caf
2021-09-20 13:29:25 +00:00
Bill Yi
dfbbc071c2
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 8e9c812e54
-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: I7668f86291ca4ccc18baee56141016cd5fe6d126
2021-09-20 13:29:24 +00:00
Bill Yi
5f9d29ac41
Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621
Change-Id: I0d7994d278d45ea2d17791b4824a46e062cb0751
2021-09-20 13:29:08 +00:00
Bill Yi
ae2e00e1d0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 13cb0a15ca
-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: I067a00a8909307ae3f52c431d4d9507d286882d1
2021-09-20 13:29:05 +00:00
Bill Yi
bd4c0ff5eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-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: Ibc7043058da7c8a68c4605ada978fa58fe7b8171
2021-09-20 13:29:01 +00:00
Bill Yi
78507d697d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-s ours am: 2cf7817de7
-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: I4848bbfd71eb759d93bb59620ccb0fc719d97f67
2021-09-20 13:28:52 +00:00
Bill Yi
24dabad62e
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617
Change-Id: Ic3ded16601c92a03262dd117d7e6eed2d002eecb
2021-09-20 13:28:48 +00:00
Bill Yi
39f5c07a46
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
am: 6c50635319
-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: Iddace0681dfb896a08d5f4180f79371d4b5ceaaf
2021-09-20 13:28:47 +00:00
Bill Yi
7159a65e51
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed
am: 15c729b335
-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: I49a5b608f3c33a6aa74a95d39bcf674cafbfc6c7
2021-09-20 13:28:37 +00:00
Bill Yi
2cf7817de7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530
-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: I89cb67f37af3095da61f90fe665e6814bd592dfe
2021-09-20 13:27:54 +00:00
Bill Yi
66375d4530
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-20 13:13:42 +00:00
Bill Yi
a24dbc064f
Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
Import translations. DO NOT MERGE ANYWHERE
2021-09-20 13:13:42 +00:00