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
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
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
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
2fb5315f95
Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 8ab420233c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196
Change-Id: I926f2e0a08496365e9fbd5b9b6cd746947025378
2021-05-27 02:51:35 +00:00
Curtis Belmonte
a551c0eafc
Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: c0773fb3e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696
Change-Id: If400f164069a6baf196408972eecf34e393c4ad5
2021-05-27 02:51:30 +00:00
TreeHugger Robot
631f2db980
Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 20f3744880
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196
Change-Id: I212dd50fbae716a0a9a8604f84a4979cf19a75aa
2021-05-27 02:42:30 +00:00
Curtis Belmonte
4bbe7beced
Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: 25b4e38015
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696
Change-Id: I713b817fa19ff9f114c7c5a6cfb7caebdd3677d4
2021-05-27 02:42:25 +00:00
TreeHugger Robot
8ab420233c
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: I012b8c511c0d1c206f437f1573f412d9053e924f
2021-05-27 02:30:56 +00:00
Curtis Belmonte
c0773fb3e6
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: I88a4681a3595d25da25d5edb5249e52cb9282ac7
2021-05-27 02:30:44 +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
TreeHugger Robot
6c387e125f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 469310b4b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740735
Change-Id: Ic0c977e351c426c509487ac7341197d6579bc0e3
2021-05-27 02:06:03 +00:00
TreeHugger Robot
7dc4ae895e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39d86df18 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740738
Change-Id: Ic3f1123422793ed6309d3b106d0af37ccf69df6f
2021-05-27 02:05:21 +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
TreeHugger Robot
469310b4b6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-05-27 01:43:27 +00:00
TreeHugger Robot
a39d86df18
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-05-27 01:43:25 +00:00
Bill Yi
8f7c4549e6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0f733e69c335e78b5096e7ebc2b33d46c13d7152
2021-05-26 23:40:18 +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
cca1f1ad74
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d9e586cede3c387509ff758a681ebb9aef0c8d9
2021-05-26 23:28:54 +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
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
TreeHugger Robot
29a26dfd66
Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: b834409f7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820
Change-Id: I737c5bac694183784090dcc65019647e975e462f
2021-05-26 19:17:05 +00:00
TreeHugger Robot
434920c3e6
Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: fcbf881fc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820
Change-Id: Ia70c7d7580c4fb960d9146a650d2e87717bed2fe
2021-05-26 19:15:09 +00: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
fcbf881fc2
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: I14cafe3cfd4d5c4a3996e58ff6844192877f02eb
2021-05-26 18:51:26 +00: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
4497e55c03
Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 1702a9e6d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467
Change-Id: I4c49a8ab1845b24d19523182889d9d0a5b67683d
2021-05-26 18:07:21 +00:00
Abel Tesfaye
697ced2aab
Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: 1ab73ef6e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634
Change-Id: I41b326ae88c9523de907f6502ac6e197019ac2fe
2021-05-26 18:07:07 +00:00
Peter Wang
0317a93e50
Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 4a7132d851
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467
Change-Id: Iaf038fe882d97014836467b30a0688b77ae9c834
2021-05-26 18:05:35 +00:00
Abel Tesfaye
9612461482
Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: ac08b132bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634
Change-Id: If68cfe699eaa550b79dbdb3e2c6feeefe5d1e0a0
2021-05-26 18:04:54 +00:00
Peter Wang
4a7132d851
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: I61ec5956d6f72249213c6cbfe30798df82c09dc4
2021-05-26 17:44:55 +00:00
Abel Tesfaye
ac08b132bf
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: I76971481cdae4b39d579934952a758aa449b771f
2021-05-26 17:44:00 +00:00