Commit Graph

82394 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Beth Thibodeau
8e67634830 Merge "Add recommendation setting and remove app settings" into sc-dev 2021-05-27 16:19:17 +00:00
Betty Chang
b857491c48 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev 2021-05-27 09:04:42 +00:00
Kevin Chyn
dc00faece6 Merge "Use lottie animation for fingerprint edu" into sc-dev 2021-05-27 08:31:55 +00:00
TreeHugger Robot
029edb7c48 Merge "Update battery defender tip string" into sc-dev 2021-05-27 05:52:19 +00:00
TreeHugger Robot
20f3744880 Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: I010f38bfe10c52e3b6c796a1a77d090b79169d9d
2021-05-27 02:27:04 +00:00
TreeHugger Robot
a8e4d51c24 Merge "Remove silky flag from tests for official release" into sc-dev 2021-05-27 02:18:23 +00:00
Curtis Belmonte
25b4e38015 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: Ia9bec4a1e4d0fe47aa4232bb87c360f67f8ad560
2021-05-27 02:15:03 +00:00
Curtis Belmonte
2c8745b58d Merge "Fix crash due to traffic light face Lottie animation" into sc-dev 2021-05-27 01:55:58 +00:00
Bill Yi
2f6b96bbf0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7fe061ce464e7a09e10a5d928393be725bd8f0e3
2021-05-26 23:36:20 +00:00
Bill Yi
99d517d63b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a43449b3ea6ef62782029b1fbd86062a708c1e6
2021-05-26 23:27:23 +00:00
Bill Yi
186570767c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia41b67be42cb2f033d3860f3c3192506bcca4e83
2021-05-26 23:22:59 +00:00
Bill Yi
f8a2c62f84 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2948411834089541f69de7ce2d4f1efa9a06c9b6
2021-05-26 23:19:33 +00:00
Bill Yi
9a44ce2abe Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4ceb03127a48ec7405f24bcdde2cd3a8114fcea1
2021-05-26 23:16:39 +00:00
Bill Yi
a886dcf23a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib0d8a1473ca1725a868d640a7b4f067b8aff0777
2021-05-26 23:13:11 +00:00
Curtis Belmonte
adf0cabe0a Fix crash due to traffic light face Lottie animation
Load the animation asset only if enabled in the resource config, to
avoid crashing on unsupported device configurations.

Test: Manual

Fixes: 189290180
Change-Id: Iae46c735277777705c1d6f4595b557e4b0b1aef7
2021-05-26 16:11:56 -07:00
Kevin Chyn
1bad80b36b Use lottie animation for fingerprint edu
The landscape layout can be removed now, since for UDFPS,
we do not use this page for the "find sensor" functionality anymore.
Instead, we show the edu animation.

Bug: 187460696
Test: manual

Change-Id: Ic2e15ecf73c42b8a0cea4ea8996b1b7dd2f3b4f2
2021-05-26 14:49:51 -07:00
Yanting Yang
098a17ccb2 Remove silky flag from tests for official release
Bug: 183670633
Test: robotests
Change-Id: Ie78a35cfc73632dcb638b78e952a1093926763bb
2021-05-27 03:05:55 +08:00
TreeHugger Robot
b834409f7c Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: Ic555a2748a97b1ffe3f99101416d31e1de264c5a
2021-05-26 18:49:38 +00:00
TreeHugger Robot
1e747a593f Merge "Rounded ripple notification history snoozed list" into sc-dev 2021-05-26 18:33:23 +00:00
Peter Wang
1702a9e6d6 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: I3572fc02e3731973ff74f4f0cae6f61e897dfe9e
2021-05-26 17:42:45 +00:00
Abel Tesfaye
1ab73ef6e8 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: Ic8f18ad55c97b02bef13d344c29967444a7282e6
2021-05-26 17:42:36 +00:00
Peter Wang
b66e797567 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev 2021-05-26 17:37:04 +00:00
Abel Tesfaye
3b3187b313 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev 2021-05-26 17:26:31 +00:00
Rajeev Kumar
701e7ac791 Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079

Change-Id: Idc410ea7b1d307dfffe2bd34282e5dd3f52bbe3e
2021-05-26 17:05:07 +00:00
Rajeev Kumar
265dd55235 Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev 2021-05-26 16:46:58 +00:00
Jay Aliomer
225607b6eb Rounded ripple notification history snoozed list
currently the ripple has sharpe edges and outside the view bounds

Fixes: b/187868531
Test: Visual
Change-Id: Iedacc6b875fa3bc4319d5e81034777dd873f7e26
2021-05-26 11:55:56 -04:00