Commit Graph

85692 Commits

Author SHA1 Message Date
TreeHugger Robot
e4097b8ae9 Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537 am: d5f9f645c3 am: f6bd155c98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031

Change-Id: Ie2532b64ea04b0aab05704fa504b4665ac0307e9
2021-05-28 04:08:28 +00:00
TreeHugger Robot
1d21a839c8 Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083 am: 1a79c0a26d am: 68fa890bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: Ied3aa7348f979dbdb8cec00e42dca673d9de56ae
2021-05-28 04:08:21 +00:00
TreeHugger Robot
aa330fdd16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8 -s ours am: 00d51f35f2 -s ours am: 606ec1ca33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a2b33fcd6b95c10fb1ae87fb6873f97700df49f
2021-05-28 04:08:15 +00:00
TreeHugger Robot
d757d54b2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours am: c6e8fc4459 -s ours am: 3961f4cd99 -s ours am: d9ca0e2b5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6784e4634da9371cb8a849567de83281d601526b
2021-05-28 04:06:54 +00:00
Bill Yi
e46c9adac6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours am: 3f0263ce7f -s ours am: ca41176024 -s ours am: dbbf25f80d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83fec2cdc9bce8cd8eb1c986e1da4ad44329e550
2021-05-28 04:05:35 +00:00
TreeHugger Robot
f6bd155c98 Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537 am: d5f9f645c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031

Change-Id: I7a62589e877d443db300dd281fd9bcc08b2616b1
2021-05-28 03:30:55 +00:00
TreeHugger Robot
68fa890bc6 Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083 am: 1a79c0a26d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: I084e79d4ae1eaf1b42b59e483354cb6391c01f36
2021-05-28 03:30:45 +00:00
TreeHugger Robot
606ec1ca33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8 -s ours am: 00d51f35f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I116583a1c3cf8e73391694cc682185592cabb503
2021-05-28 03:30:39 +00:00
TreeHugger Robot
d9ca0e2b5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours am: c6e8fc4459 -s ours am: 3961f4cd99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I445fad39f0001c28d3d93bf313e1f799e9e8e56a
2021-05-28 03:30:09 +00:00
Bill Yi
dbbf25f80d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours am: 3f0263ce7f -s ours am: ca41176024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6227759631978589917d900f482df70518d8d4fc
2021-05-28 03:29:06 +00:00
TreeHugger Robot
434459bce7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours am: 197a03a9de -s ours am: 18684c37cb -s ours am: a146ba8797 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I419dfe16ab600236b692604b223198bb01ba5fe0
2021-05-28 03:16:42 +00:00
Bill Yi
786f37b2c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours am: 9b1dc74d75 -s ours am: c51ddfc7ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icef4ed6fbf7de55ed324ffe2fc8ae14eda9a1bb6
2021-05-28 03:16:00 +00:00
TreeHugger Robot
c76738885e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours am: 50eba21a6a -s ours am: 8b32f523fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb9f7d30ae043ec1551fcda25ed1c8c82375ff66
2021-05-28 03:14:31 +00:00
Beth Thibodeau
910d1f7aa8 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: b7749fd405 am: baf515ee95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I300769f058b71090dee2d9581dab72c1e1332031
2021-05-28 03:06:49 +00:00
Betty Chang
4182307ec9 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 am: 8fdf4774b4 am: 58e10e06c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: If3f90c94cb71b306d82bf11c609fbf1cf3be31d5
2021-05-28 03:06:35 +00:00
Kevin Chyn
5ee511cdf2 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: e6eb1020f8 am: a0adbe1918
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I9812b61f0a82038d53d8d63837c9305ac6bbec12
2021-05-28 03:06:28 +00:00
TreeHugger Robot
d5f9f645c3 Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031

Change-Id: I7018ef909bd6d67fcf83b86fe3a116d4a0902f5d
2021-05-28 03:05:31 +00:00
TreeHugger Robot
1a79c0a26d Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: Ia4d3be59a713405159191f391aef3f855b593083
2021-05-28 03:05:25 +00:00
TreeHugger Robot
00d51f35f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia17ba8c86e99f2cbd0db00fdb9f387655985acd8
2021-05-28 03:05:18 +00:00
TreeHugger Robot
3961f4cd99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours am: c6e8fc4459 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49ac7f4af71c7cac12fe84b436c964c8f6154301
2021-05-28 03:04:54 +00:00
Bill Yi
ca41176024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours am: 3f0263ce7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I863cfafd3c617c662d1fdab913bcff847e6e5617
2021-05-28 03:04:35 +00:00
TreeHugger Robot
2a02febbfe Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 am: 509a09653b am: d799e4332b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: I0e11cdd3dd74b46bcfc04d7cfa43391469aebf86
2021-05-28 03:03:09 +00:00
TreeHugger Robot
a146ba8797 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours am: 197a03a9de -s ours am: 18684c37cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1fe916646107b4526d6a761da26be0f85c3c5973
2021-05-28 02:58:57 +00:00
Bill Yi
c51ddfc7ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours am: 9b1dc74d75 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9bd16588b3717d5ae30cc8b91fc5013799c9e62a
2021-05-28 02:58:35 +00:00
TreeHugger Robot
18684c37cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours am: 197a03a9de -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4b16108472d7951050281a5455ebbb9bb594296
2021-05-28 02:58:22 +00:00
TreeHugger Robot
8b32f523fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours am: 50eba21a6a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5e7e5bccbc5a26aeb0f1a4f8b32794c158d7db3
2021-05-28 02:57:18 +00:00
Beth Thibodeau
baf515ee95 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: b7749fd405
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I5abe8f9c14241fd6ee339a66b3380ffcf3959a7a
2021-05-28 02:56:16 +00:00
Betty Chang
58e10e06c3 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 am: 8fdf4774b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: Id87b97cb260d45d606f67495c42609464d8ce5c1
2021-05-28 02:56:06 +00:00
Kevin Chyn
a0adbe1918 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: e6eb1020f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: If9d9caeebfb36ae47b8f1836433f71b004fa5f13
2021-05-28 02:55:59 +00:00
Bill Yi
9b1dc74d75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48bccc432fdc813a96bc2ba99ab4053861601f6a
2021-05-28 02:53:36 +00:00
TreeHugger Robot
d799e4332b Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 am: 509a09653b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: Ie16aa71fa0894495fa0fa773505b4196ebc2141d
2021-05-28 02:53:22 +00:00
TreeHugger Robot
50eba21a6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3677657d757665f0419d270d3b2be3eb2ee55b45
2021-05-28 02:51:14 +00:00
Beth Thibodeau
b7749fd405 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I93ad28321bdc880f9fda6c6299cb1b5b60d81cfa
2021-05-28 02:29:54 +00:00
Betty Chang
8fdf4774b4 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: Iad8e167b8f9f38b906ceb14cb9a713e8e200c354
2021-05-28 02:29:30 +00:00
Kevin Chyn
e6eb1020f8 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I76b7fff784faa5945717c1ec3d016f7ab57d5ece
2021-05-28 02:29:24 +00:00
TreeHugger Robot
509a09653b Merge "Update battery defender tip string" into sc-dev am: 029edb7c48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: Id714cf519433966edd608cb9f62b9d12b7e5d384
2021-05-28 02:24:48 +00:00
TreeHugger Robot
2bc0aa5537 Merge "Fix LocationSetttingsFooter robotests" into sc-dev 2021-05-27 20:23:53 +00:00
TreeHugger Robot
2718cea083 Merge "Fix scrolling issue after MLS switches" into sc-dev 2021-05-27 19:57:34 +00:00
TreeHugger Robot
07b7a97ce8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-27 19:04:20 +00:00
TreeHugger Robot
c6e8fc4459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia552b51f6ce6e5c5cc0a7235638b3a1af8d1b406
2021-05-27 19:01:35 +00:00
Bill Yi
3f0263ce7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77480c4c38b35835e2b7ceff07e070e31150eaa7
2021-05-27 19:01:11 +00:00
TreeHugger Robot
c4882fe250 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-27 18:56:30 +00:00
TreeHugger Robot
695cdae2f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-27 18:48:17 +00:00
TreeHugger Robot
197a03a9de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9540649bb2977b9324dc81069cfcb8026a5a70d8
2021-05-27 18:45:37 +00:00
Bill Yi
332a439d60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I870af03ea6bb50cc77f123ea6426039b2c6c2d9a
2021-05-27 18:45:28 +00:00
TreeHugger Robot
4b9bf7e90c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-27 18:44:37 +00:00
TreeHugger Robot
c2bc9bfc54 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-27 18:37:28 +00:00
Yu-Han Yang
fdff6af031 Fix scrolling issue after MLS switches
Bug: 187546020
Test: on device
Change-Id: Ie1c573396cbc8b3256db5e350c622e566a44495c
2021-05-27 11:31:09 -07:00
Yu-Han Yang
7a2122e35a Fix LocationSetttingsFooter robotests
Bug: 189352953
Test: tests passing
Change-Id: I4ca1a53449a6b845e39bcb7423cfee2ee5c9d820
2021-05-27 11:26:00 -07:00
TreeHugger Robot
660d37d895 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-27 18:21:27 +00:00