Commit Graph

85365 Commits

Author SHA1 Message Date
Felipe Leme
83f4af30b8 Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4 am: 779d68ca4b am: ac5788175c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084

Change-Id: Idd1855308903aaac7dda658a796608a8d3af8fee
2021-05-25 19:45:24 +00:00
Felipe Leme
ac5788175c Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4 am: 779d68ca4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084

Change-Id: I7262ea5fbf020382e261d976cedae226ce37280b
2021-05-25 19:30:09 +00:00
Felipe Leme
779d68ca4b Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084

Change-Id: I6c3d96994d7faa0af63f43911bf382c83219f00d
2021-05-25 19:29:36 +00:00
TreeHugger Robot
719b616833 Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111 am: 2fa3ec90a4 am: aae3e29f3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: I8f0f2e5e9c9a82d3232ddd2e7b4033815d72b5ec
2021-05-25 19:27:22 +00:00
Felipe Leme
d51e6cb7a4 Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev 2021-05-25 19:13:18 +00:00
TreeHugger Robot
aae3e29f3b Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111 am: 2fa3ec90a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: I3295f9fff780ccb4569a34cf7059be8ba1c1b13d
2021-05-25 19:04:46 +00:00
TreeHugger Robot
2fa3ec90a4 Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: Idad8cf30fb63f461e3abe2698c5e523ecab2e20a
2021-05-25 18:50:26 +00:00
TreeHugger Robot
9018434111 Merge "Apply sliding transition for lock screen" into sc-dev 2021-05-25 18:35:13 +00:00
TreeHugger Robot
d867dc7d20 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc -s ours am: 37947fc40c -s ours am: 83c9b66bde -s ours am: 8bac70524b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78f55e5c0964cb2e73ca0900722f3623c53b1b04
2021-05-25 15:58:59 +00:00
Bill Yi
b809e61a16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours am: 1474e88ef3 -s ours am: fd33e355bb -s ours am: 291434e246 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9bbae3228c41fdceafef33fcca3a08ed925f9aac
2021-05-25 15:57:33 +00:00
TreeHugger Robot
8bac70524b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc -s ours am: 37947fc40c -s ours am: 83c9b66bde -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82d820f69aa5da48cff357cfc6165f37931c4933
2021-05-25 15:39:58 +00:00
Bill Yi
291434e246 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours am: 1474e88ef3 -s ours am: fd33e355bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I119a7f1364482afc88003834aae0ef8bf692e32c
2021-05-25 15:39:45 +00:00
TreeHugger Robot
83c9b66bde [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc -s ours am: 37947fc40c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4211f334b1b4909f3f1cb256a3bcd5d5dbaea67
2021-05-25 15:17:01 +00:00
Bill Yi
fd33e355bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours am: 1474e88ef3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54c577e1a7edec9002ebe462db60e6752f3ae18a
2021-05-25 15:16:48 +00:00
TreeHugger Robot
8b4a727041 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6 -s ours am: f556c56609 -s ours am: ba541184cb -s ours am: e1e2cb07a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1fef5f6f1a6a10cce4da15969d87238bd29ea1a
2021-05-25 15:15:51 +00:00
Bill Yi
61c69f957d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours am: 9769c467a3 -s ours am: 585a56bcef -s ours am: ffbaa0602d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3653889126157307418f5e48e3fc138613f0b30
2021-05-25 15:15:46 +00:00
TreeHugger Robot
60d12c799c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6 -s ours am: 3f259b2d28 -s ours am: f7657138b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e59acf3a3d44262b76b136b28707539bbfda733
2021-05-25 15:15:41 +00:00
TreeHugger Robot
690bb6737b Merge "Update fonts & colors" into sc-dev am: bdd98ec216 am: 82410f1321 am: c2ae8c09d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067

Change-Id: Ida84a3ec76d365cf1b0af5ac0b750b5834391fc1
2021-05-25 15:15:36 +00:00
TreeHugger Robot
0e153a75fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1 -s ours am: 5c3b582643 -s ours am: c83b5ae77d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia38438aadcd8edf8f6fd846f0fe6895b1588526d
2021-05-25 15:15:13 +00:00
TreeHugger Robot
e1e2cb07a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6 -s ours am: f556c56609 -s ours am: ba541184cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02d984502ac1093a1d63f3e2336847ec89b0da9c
2021-05-25 15:00:09 +00:00
TreeHugger Robot
37947fc40c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f0f358961066530f199940f196f4a3ef19b654b
2021-05-25 15:00:06 +00:00
Bill Yi
ffbaa0602d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours am: 9769c467a3 -s ours am: 585a56bcef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86ea73bf3d9270dc92a4f57f1f7e5629285c636a
2021-05-25 15:00:05 +00:00
Bill Yi
1474e88ef3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09016ff83f9d48a2fd2f925c8ecbfbeed49a1c20
2021-05-25 14:59:56 +00:00
TreeHugger Robot
f7657138b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6 -s ours am: 3f259b2d28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3ab4090cbdb563fba582ac2541e97f7f1d6274a
2021-05-25 14:59:53 +00:00
TreeHugger Robot
c2ae8c09d0 Merge "Update fonts & colors" into sc-dev am: bdd98ec216 am: 82410f1321
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067

Change-Id: I37ce8f238e7c3a6f18d78b49f7dfffa0ddfbf0e5
2021-05-25 14:59:44 +00:00
TreeHugger Robot
c83b5ae77d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1 -s ours am: 5c3b582643 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0708fffc078452e84283f79c3bf3ab92190d0aea
2021-05-25 14:59:08 +00:00
TreeHugger Robot
a75a0302cc Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-25 14:45:06 +00:00
TreeHugger Robot
ba541184cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6 -s ours am: f556c56609 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bb1ddcca38464f2e709df40362ce030061643ba
2021-05-25 14:44:07 +00:00
Bill Yi
585a56bcef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours am: 9769c467a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6adaa25b6e440223b664f0c0d2a220709107697
2021-05-25 14:44:00 +00:00
TreeHugger Robot
3f259b2d28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3bf4558fae7a02b6c39a62ba60d6ecca3046d4fd
2021-05-25 14:43:52 +00:00
TreeHugger Robot
f556c56609 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e32efe0e2586a085b1b2fc3771ccf3e65aa4b76
2021-05-25 14:42:20 +00:00
Bill Yi
9769c467a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic964765ba631ee92349015f35f53424d9578badf
2021-05-25 14:42:00 +00:00
TreeHugger Robot
00764f15b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-25 14:37:46 +00:00
Yanting Yang
9bd87ac468 Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c am: c683578f62 am: a5dd355ea6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192

Change-Id: Ied00e2b430578ffa31b82c270fed1911d88e1215
2021-05-25 14:37:18 +00:00
TreeHugger Robot
82410f1321 Merge "Update fonts & colors" into sc-dev am: bdd98ec216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067

Change-Id: Idfec549778720396dbdf566e047bcb33821743a4
2021-05-25 14:37:13 +00:00
TreeHugger Robot
9c6ccc0267 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e51edfa21d -s ours am: 33758b9128 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c68119a10285bb143ab94424e7b7bc426bc64e8
2021-05-25 14:37:11 +00:00
TreeHugger Robot
b69dee45d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c6c84165aa -s ours am: 137d0feae9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77985cef44728905605a0f8e0226d82881d85a1b
2021-05-25 14:36:32 +00:00
Jernej Virag
c4599c5f9c Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e am: cd09893698 am: 81617c7d95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326

Change-Id: Ia0394acc16e827bf41fd80f5641495b767b3ceb8
2021-05-25 14:35:55 +00:00
TreeHugger Robot
5c3b582643 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d9b646060e03e018d440e7dc6e449e3e3af80da
2021-05-25 14:35:28 +00:00
TreeHugger Robot
6684a6577a Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735 am: 50d5302023 am: cf9703713e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964

Change-Id: I66ab00892b8f287b42cb5959d73fc816520f7814
2021-05-25 14:35:12 +00:00
Yanting Yang
c7d9e7e92e Merge "Remove Advanced section" into sc-dev am: 5dede180cd am: a0032ae306 am: 0a6186c1f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191

Change-Id: I948c7588b5555416baf5e56bfee19f6d769d709d
2021-05-25 14:34:33 +00:00
TreeHugger Robot
bdd98ec216 Merge "Update fonts & colors" into sc-dev 2021-05-25 14:34:16 +00:00
TreeHugger Robot
64d9cc56c6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-25 14:30:07 +00:00
TreeHugger Robot
dfa0fe0212 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-25 14:25:40 +00:00
TreeHugger Robot
667f23582d Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-25 14:22:38 +00:00
TreeHugger Robot
2baf80f3a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-25 14:22:36 +00:00
Yanting Yang
a5dd355ea6 Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c am: c683578f62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192

Change-Id: Id6d4acaafa8d5fdf17a45b72ed8ea125885c8e8f
2021-05-25 14:06:27 +00:00
Yanting Yang
c683578f62 Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192

Change-Id: I4b5719c72e5e1a03e150c8f813884dbdb9ca6567
2021-05-25 13:59:50 +00:00
TreeHugger Robot
33758b9128 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e51edfa21d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I555ed273123cdded8a73e0fc2af64023411acf6e
2021-05-25 13:58:09 +00:00
TreeHugger Robot
137d0feae9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c6c84165aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69ae50b5b859555e62266a4cc8c494de74e06714
2021-05-25 13:58:04 +00:00