Commit Graph

85628 Commits

Author SHA1 Message Date
TreeHugger Robot
c2bc9bfc54 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-27 18:37:28 +00:00
TreeHugger Robot
e7e5e3ba4a Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 8ab420233c am: 2fb5315f95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: Ie036cb6f810c3151999e38eb160c86a54f16df20
2021-05-27 03:03:50 +00:00
Curtis Belmonte
e71e74fffb Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: c0773fb3e6 am: a551c0eafc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: If81398ef288cd937b9c3155e44487478049da056
2021-05-27 03:03:45 +00:00
TreeHugger Robot
b0d278f22d Merge "Remove silky flag from tests for official release" into sc-dev am: a8e4d51c24 am: 20f3744880 am: 631f2db980
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733196

Change-Id: I9d19285fc67034540f51e84c4e97030e6753e7d6
2021-05-27 03:03:38 +00:00
Curtis Belmonte
c3a2fe3ab9 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: 25b4e38015 am: 4bbe7beced
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: I0a35f5c08f89a73b440cfb7abc3f3b2adde39c76
2021-05-27 03:03:32 +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
Yo Chiang
590b070ae8 [automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49 am: 06bf3f1993 -s ours am: bf238d463c -s ours am: df2566455c -s ours
am skip reason: Merged-In Ib6b450489c63913c47858cf295e4785fd5d0cfbb with SHA-1 a366690de1 is already in history

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

Change-Id: I2304fa31641d71508e39ab01ba2fe4d860ee211c
2021-05-27 02:43:32 +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
6a91a8b49c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 469310b4b6 -s ours am: 6c387e125f -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: Iee3eddec245d7b1cd4162ee467466e3bf2b91e70
2021-05-27 02:28:58 +00:00
TreeHugger Robot
b593cd1f4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39d86df18 -s ours am: 7dc4ae895e -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: Id49e8af02c0ead6ca2fbfa6dff8588016ceefe9e
2021-05-27 02:27:26 +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
ac8dae621e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I17b1b7d3f98301a5bae7823b6c6bfbf76af410e1
2021-05-26 23:32:27 +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
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
TreeHugger Robot
ea9f1dea12 Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: b834409f7c am: 29a26dfd66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: I67b12beababe83e9b8f8dfeb6aeeb026ea29891d
2021-05-26 19:31:19 +00:00
TreeHugger Robot
00306d9858 Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: fcbf881fc2 am: 434920c3e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: I2394ebd50b60134094df4a6d7dc482dbf6f7e247
2021-05-26 19:30:27 +00: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
c2c75862ba Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 1702a9e6d6 am: 4497e55c03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

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

Change-Id: Ibb631b37c2d1bf3e8dadda8e703d33a58a7e6495
2021-05-26 18:21:53 +00:00
Peter Wang
5a8b9cbb4a Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 4a7132d851 am: 0317a93e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: I7d1b3bdb4da0f3838e365379f48bfa5a2c5d9318
2021-05-26 18:21:40 +00:00
Abel Tesfaye
a09530fd74 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: ac08b132bf am: 9612461482
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: If7a094e22e7762e851fabef9740f9217a6eaf6b9
2021-05-26 18:21:03 +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
Rajeev Kumar
db916e8bee Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235 am: 701e7ac791 am: 0924217fce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079

Change-Id: If6489a4123bb1339630f1a4a898eda10bbdab4e7
2021-05-26 17:43: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
Rajeev Kumar
0afd586789 Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235 am: 4c18ba65c6 am: ad4390f270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079

Change-Id: I3227b72270c88e88908c62b49710b09c5e4d7c1f
2021-05-26 17:42:32 +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