Commit Graph

84414 Commits

Author SHA1 Message Date
TreeHugger Robot
a658e81ea3 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12 am: 73f3a0d290
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: I18f41523d1d1d514afd710eec00505960facc4bb
2021-06-21 12:29:54 +00:00
TreeHugger Robot
ab0bb410a3 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 7514aebc80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: Ie8906f73efc1c7591f7e53e26d94001b14080d52
2021-06-21 12:29:47 +00:00
TreeHugger Robot
184ca3591f Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1 am: 54bb0bd2fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: I721768e83c6e45c5f6386cd6308fea6e6d8dd38a
2021-06-21 12:18:24 +00:00
TreeHugger Robot
73f3a0d290 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: Iec1e16c2bf5f4568c589da8d4c9dc0282abba813
2021-06-21 12:15:32 +00:00
TreeHugger Robot
7514aebc80 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I71b6663e9580e72f382b465d53904698e18c2f5d
2021-06-21 12:15:02 +00:00
TreeHugger Robot
54bb0bd2fb Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: I672d10f3e7549026a9a9cff35237e4c53001ad58
2021-06-21 12:14:42 +00:00
TreeHugger Robot
f4a1b19c12 Merge "Update the image for Fingerprint Finish page" into sc-dev 2021-06-21 10:29:34 +00:00
TreeHugger Robot
dbaad0436d Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev 2021-06-21 10:00:14 +00:00
Yi-Ling Chuang
c55b2cef2a Revert "Suppress Shared Axis transition on the SIM dialog"
This reverts commit 5e8a3947d2.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I0d4756797914ac5bcb37dde31e80dc4cd45fcd6b
2021-06-21 09:32:01 +00:00
Mill Chen
6f93ac0eec Update the image for Fingerprint Finish page
Fix: 188733201
Test: visual verified
Change-Id: Iebb9eaa201ac5481df0104b9394dbc9959aa0c52
2021-06-21 17:20:00 +08:00
TreeHugger Robot
23222388c1 Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev 2021-06-21 09:17:32 +00:00
TreeHugger Robot
c88a3b34c6 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 33eb3bf53e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I2e4b14305fd92fb6c69d1ff1285c7afb83a164ca
2021-06-21 08:24:25 +00:00
TreeHugger Robot
33eb3bf53e Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I0feef8ebc111c93654cb621e78a59392028c2dae
2021-06-21 08:09:30 +00:00
TreeHugger Robot
b5b519dd85 Merge "Remove the duplicated skip lock screen setting" into sc-dev 2021-06-21 07:54:30 +00:00
TreeHugger Robot
08cdb43331 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours am: 86ee46b1f8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040797

Change-Id: Icaee3dffdf23ccda730390da8c1cbbbb7e58b550
2021-06-20 18:39:10 +00:00
Bill Yi
c54f7381cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours am: 3b1538a6d6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040799

Change-Id: I54f941512c2d22867eadaaa233adc828dc00a9fe
2021-06-20 18:39:04 +00:00
TreeHugger Robot
58a9735197 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours am: 2ac1b8e36e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040802

Change-Id: Ia621227460f8609a71cf93f1fe7faffa4a133564
2021-06-20 18:38:57 +00:00
Bill Yi
5c6b65645d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: 3df426dc72 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040801

Change-Id: If97223a508a52472800383c7df8672b343aafab0
2021-06-20 18:38:49 +00:00
Automerger Merge Worker
43de77e6b0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: a4f4365870 -s ours" into sc-v2-dev-plus-aosp 2021-06-20 18:38:38 +00:00
TreeHugger Robot
3c85cd471f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: a4f4365870 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040804

Change-Id: I1441940c6dd52b967d2e137990f37e361f90ec93
2021-06-20 18:38:36 +00:00
TreeHugger Robot
85ebd314aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours am: b80251b7bc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040797

Change-Id: I9a4b536540a0d1acf3bbe5172e882d275fab481d
2021-06-20 18:38:34 +00:00
Bill Yi
db8f6e743a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours am: afab5c94b9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040799

Change-Id: Ia856129f4fbccd21278cb2070eb7e19560475fe9
2021-06-20 18:38:30 +00:00
TreeHugger Robot
984efdef5f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours am: d942057a8c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040802

Change-Id: I90ef2c9f0a2cf412f551465406824fb6ba643aaa
2021-06-20 18:38:23 +00:00
Automerger Merge Worker
142ee38e5e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: eb1b956aae -s ours" into sc-v2-dev-plus-aosp 2021-06-20 18:38:18 +00:00
Bill Yi
e5c421fd92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours am: eb1b956aae -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040801

Change-Id: I9b0c568edaf2dc52624f3d91f0477a9ee95b3065
2021-06-20 18:38:16 +00:00
Bill Yi
75e8aa0a2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours am: 34c7574de2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040807

Change-Id: I989c7aadab28e3473d4e27099ee2fba5d650ee4d
2021-06-20 18:38:12 +00:00
TreeHugger Robot
5f7b4091f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours am: 90ea72a84c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040804

Change-Id: I1a5e3147d8d3b1bb3b9e0b5f996465d0e2906af3
2021-06-20 18:38:05 +00:00
Bill Yi
884f6e4402 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours am: 44b78dc633 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040807

Change-Id: I0596c94bb2cd9eebfe366f896a447b2b2e7f2a84
2021-06-20 18:37:42 +00:00
TreeHugger Robot
b80251b7bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040797

Change-Id: I6cc2691368444aebf7ba33328f30af422e54d6bc
2021-06-20 18:27:56 +00:00
Bill Yi
afab5c94b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040799

Change-Id: I10449f2b10ace91a79a6d8764bc493298d9964b4
2021-06-20 18:27:37 +00:00
TreeHugger Robot
d942057a8c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040802

Change-Id: Ia76a689c910e87296a09d9136e91441f1c6969ab
2021-06-20 18:27:11 +00:00
Bill Yi
eb1b956aae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040801

Change-Id: Ic5577954c0ac2b855e64f4c27efd24775d4fecdd
2021-06-20 18:26:39 +00:00
TreeHugger Robot
90ea72a84c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040804

Change-Id: I02281c85a6c689dffbc517327c3c99f30d939268
2021-06-20 18:25:59 +00:00
Bill Yi
44b78dc633 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040807

Change-Id: I20bd2ba4d5264fdcb9f83cf9d22a8c1a8869c3d4
2021-06-20 18:24:46 +00:00
TreeHugger Robot
86ee46b1f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040797

Change-Id: Ia9f79a1a1f4b49280964393c3d71033b9df29e6c
2021-06-20 18:24:06 +00:00
Bill Yi
3b1538a6d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040799

Change-Id: I2d93ab997dcd38a768a54b258658cb428689e75d
2021-06-20 18:23:59 +00:00
TreeHugger Robot
2ac1b8e36e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040802

Change-Id: I419c63910d6d1376bb22668a610a2465c9cb6cde
2021-06-20 18:23:53 +00:00
Bill Yi
3df426dc72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040801

Change-Id: I60514f5df9d03178f3345ae636b2c2379777e8e5
2021-06-20 18:23:46 +00:00
TreeHugger Robot
058027f470 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040797

Change-Id: I86a655610ea394d6612d2b4dea7dee83ed08edc1
2021-06-20 18:23:41 +00:00
TreeHugger Robot
a4f4365870 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040804

Change-Id: I129610529d884d3c6e0b162fe7fd62047d87f9a6
2021-06-20 18:23:39 +00:00
Bill Yi
9620fa8249 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040799

Change-Id: I0208233adf22b2cf01a19ae1c4d197a99f2090e6
2021-06-20 18:23:31 +00:00
Bill Yi
34c7574de2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040807

Change-Id: Iabd4632097659e873f0dea5899a19d1a2341221a
2021-06-20 18:23:18 +00:00
TreeHugger Robot
d768d1b3b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-20 18:11:44 +00:00
TreeHugger Robot
64ab66344d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040802

Change-Id: I34013563e522a7f1db4b967d4ebca58713d33752
2021-06-20 18:01:02 +00:00
Bill Yi
b9a47c348f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040801

Change-Id: I6e000079fb1073019825a891eb642f9ec476d3e3
2021-06-20 18:00:52 +00:00
TreeHugger Robot
0fc2e32ecc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-20 17:58:33 +00:00
TreeHugger Robot
e17516456f Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-20 17:56:15 +00:00
TreeHugger Robot
87ae0f37b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8237b4510d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040808

Change-Id: Id7472558fa753fd79e1ebe0a89e589f798842a06
2021-06-20 17:52:57 +00:00
Bill Yi
caf95a224a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6cb17b2688 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15040805

Change-Id: I7d4021c1a9fbf456da6a52a0cbae5da959b988d5
2021-06-20 17:52:38 +00:00
TreeHugger Robot
8237b4510d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-20 17:41:40 +00:00