Bill Yi
743886b300
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours am: dc38186e69 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124705
Change-Id: I91b32b7c5651e54c0229614f4074e8e4331e6c9d
2021-10-27 02:28:50 +00:00
TreeHugger Robot
9b72863bfa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 06cca879db -s ours am: d0240c3795 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I17759d8c7828756ee47e14a7b7b18346b96c6a2f
2021-10-27 02:28:46 +00:00
Bill Yi
9029e0204e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: 8e49756934 -s ours am: 5e70ebba87 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Ie05ad586b56df2f883f8b1d22d05440b7d41e199
2021-10-27 02:28:41 +00:00
TreeHugger Robot
4d9b03d408
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours am: 9b325cd54f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Id12eca443f44ac31b1a2017c19122883d1fe530a
2021-10-27 02:18:44 +00:00
TreeHugger Robot
e19e9e08dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours am: 700fe7493b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124572
Change-Id: Id66cc4f8b535680a76e586bf091fd5e309c84dcf
2021-10-27 02:18:39 +00:00
TreeHugger Robot
714f01e724
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47 am: 9f6ae4ff97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Ie6301ded1ea2c787f66a72a5f876c83bee990519
2021-10-27 02:18:30 +00:00
Bill Yi
3424128189
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours am: 39e322145f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Ifdd66f33b7e50367a83b0bd84e20ac2cd482e014
2021-10-27 02:18:28 +00:00
TreeHugger Robot
888fb7ca36
Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac am: 034ff149d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I4708e2611d93fafd79a6d205b96b6a8fa637afd6
2021-10-27 02:18:05 +00:00
Bill Yi
3334d7154c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours am: 80ff342b4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I7e57f11e0000be29218170ce3932e558796b3fe5
2021-10-27 02:18:03 +00:00
Bill Yi
574609641b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours am: 9153fc1720 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124705
Change-Id: Ibff4043394fcf17bfb35e0e67752b5dfe859811e
2021-10-27 02:17:49 +00:00
TreeHugger Robot
0d439097e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I0056b7b04e308d6bdeb2533c97fad53d21697f31
2021-10-27 02:11:16 +00:00
TreeHugger Robot
2f0041e4d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124572
Change-Id: I47a21aefaf98b243da8b0e5e582b446e06cf1d38
2021-10-27 02:11:11 +00:00
TreeHugger Robot
9b325cd54f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I3d7ff4a2ccb00a5e9f8a8488051f4d464efc986a
2021-10-27 02:11:09 +00:00
TreeHugger Robot
9106e9620f
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I81168d13a1443005119e04d6273cbeccbd580c27
2021-10-27 02:11:06 +00:00
TreeHugger Robot
700fe7493b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124572
Change-Id: I2575e86ccc14baf32e0424a3e936d0a1b00cad4d
2021-10-27 02:11:04 +00:00
Bill Yi
d781548aa6
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Ifd9abac9f46ffc7d6998f2c715f34f68ba4f3715
2021-10-27 02:11:03 +00:00
TreeHugger Robot
9f6ae4ff97
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I6ee98b123204aa1c83b18409bdb12e1e46f568f4
2021-10-27 02:11:01 +00:00
Bill Yi
39e322145f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Id35f11c2ecea70a0b98a0479a62e5f10d361f915
2021-10-27 02:11:00 +00:00
TreeHugger Robot
751b27ec19
Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Icf585266fffc4db9a322e6924dedbd2fc59c08c4
2021-10-27 02:10:53 +00:00
Bill Yi
d26d1fcb48
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: If94e2b34699ba396da068c3fc2080b0de9309960
2021-10-27 02:10:52 +00:00
TreeHugger Robot
034ff149d1
Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Ia522af0c4e271be71c76a52b4b8497311950fcc7
2021-10-27 02:10:52 +00:00
Bill Yi
80ff342b4a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I548359fef73f55692e18df0a511c932ae0b7e9b1
2021-10-27 02:10:51 +00:00
TreeHugger Robot
48b79c4f7d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: If077afe3d023be33c98959da914fff0e3a59b0e5
2021-10-27 02:10:44 +00:00
Bill Yi
dc38186e69
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124705
Change-Id: I975aff16356623fd7accf15561dc95d9aefd7caf
2021-10-27 02:10:44 +00:00
Bill Yi
9153fc1720
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124705
Change-Id: Ifd794d4c6533dd6ed2b188d115fd044a512c8068
2021-10-27 02:10:44 +00:00
TreeHugger Robot
d0240c3795
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 06cca879db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I0523de0268fb4c2443cfcdd8ed58c4841fa2b3b8
2021-10-27 02:08:50 +00:00
Bill Yi
5e70ebba87
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: 8e49756934 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I084b4d2ac9411ad10a4c267390c8b91379f9eebe
2021-10-27 02:08:46 +00:00
TreeHugger Robot
2361df8e37
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 336aa9899c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124706
Change-Id: Ia6b8adc1eddb38be6636fb5c58393fde5610fcdc
2021-10-27 02:08:20 +00:00
TreeHugger Robot
a1a8716b23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0317f233ce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124573
Change-Id: Ib237d21a8fc7601c10d06069bff40b558b514079
2021-10-27 02:08:10 +00:00
TreeHugger Robot
06cca879db
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I414e913bdd299cbff9893077cfbf52e2811cde5f
2021-10-27 02:03:25 +00:00
TreeHugger Robot
778ae33620
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-27 01:50:53 +00:00
TreeHugger Robot
9bd68e3a97
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-10-27 01:50:49 +00:00
TreeHugger Robot
5416ffde47
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:49 +00:00
TreeHugger Robot
7b45d4a7ac
Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:46 +00:00
TreeHugger Robot
336aa9899c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-27 01:50:37 +00:00
TreeHugger Robot
0317f233ce
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-27 01:50:35 +00:00
Bill Yi
0e6f17b4fb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic913ba48bfa2a032682246df0175852aa8bee859
2021-10-26 18:11:34 +00:00
Bill Yi
141d4127f8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I356d775f02056287568b055d49f755efdf1ef901
2021-10-26 18:07:42 +00:00
Joshua Mccloskey
23e3603e69
Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev am: fd96fe156c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16103499
Change-Id: I46e6989e1e50718b09263d2d24c16105276016a9
2021-10-26 18:05:13 +00:00
Bill Yi
8c035094b8
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Ia5cac899e699134c9c3dededfec0419871b5f097
2021-10-26 18:04:03 +00:00
Bill Yi
49389665fa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a2e84d9174edd3eaff854cd7197147fa7888baa
2021-10-26 18:03:56 +00:00
Bill Yi
16c371fe43
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7dcedca7a4057f9765dfe306c3134f8f82c757e0
2021-10-26 17:55:56 +00:00
Bill Yi
9975577fd7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24332f87c03f57644fd6ffb3d1819f184a54a170
2021-10-26 17:54:07 +00:00
Bill Yi
f7af4b6fb0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I73f1f4c5f9b93372fd9d02f9b193922c751526cc
2021-10-26 17:52:36 +00:00
Bill Yi
8e49756934
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Ib88fd011aa4e79ac0fbf689dd5c91e249865a767
2021-10-26 17:52:35 +00:00
Bill Yi
a6de7ad6b8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ied645d81839a1c5b98efcdd508a69aeb291a8feb
2021-10-26 17:52:29 +00:00
Joshua Mccloskey
fd96fe156c
Merge "Fixed bug causing user to be stuck on face intro" into sc-v2-dev
2021-10-26 17:49:36 +00:00
Mill Chen
dc4ec9bfca
Update animation for fingerprint edu page
...
Bug: 197264655
Test: visual verify
1) Navigate to fingerprint unlock and start fingerprint enrolling flow
2) Observe the education page and see if the animation works
Change-Id: Id07ee17fac29f8f49babb137889e50514ec86326
2021-10-26 15:16:50 +08:00
TreeHugger Robot
1568b185a5
Merge "Fix the NPE when input a wrong package" into sc-v2-dev am: baa58563bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115939
Change-Id: I6f31dab56fdc71f617dad4a4e0d471093d843aca
2021-10-26 03:42:47 +00:00
Weng Su
3b99a81e78
Move android.settings.WIFI_SETTINGS action to Internet Settings
...
- Starting from S, the WiFi Settings is changed to Internet Settings
- Redirect to WiFi Settings if Provider Model disabled
- Don't use FLAG_ACTIVITY_NEW_TASK to avoid Lock Task Mode impacted
Bug: 199364761
Bug: 198740257
Bug: 203191404
Test: manual verified by TestDPC apk (see b/198740257#comment41)
Change-Id: I3c283ef58b37f4d3fe27045f431932a35af55023
2021-10-26 03:39:13 +00:00