Commit Graph

84826 Commits

Author SHA1 Message Date
Bonian Chen
e0667d76d6 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: 80d7c162d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I41b520c31b5ffaef539f3873f4b2863cbf907960
2021-06-28 04:13:08 +00:00
Bonian Chen
bf0827680b [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: 8e80d83db5 -s ours
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

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

Change-Id: I046dea0a350b64b41b2798d28f81af85674ff41d
2021-06-28 04:13:07 +00:00
Arc Wang
cc4745e44c Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 14920afb08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I927766434199149ea622f98ecb5471ef7dc943a8
2021-06-28 04:13:02 +00:00
Bonian Chen
80d7c162d6 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I527a0776f2d90cd46e79d1a6166c9299d0455d15
2021-06-28 04:03:59 +00:00
Bonian Chen
8e80d83db5 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

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

Change-Id: I082fadec71144aa9704292de422a4a8f2deb55ab
2021-06-28 04:03:58 +00:00
Bonian Chen
c437177d4b Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev 2021-06-28 03:59:43 +00:00
Bonian Chen
bf4120f3f8 Merge "[Settings] Fix build breakage" into sc-dev 2021-06-28 03:59:43 +00:00
Arc Wang
14920afb08 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: Iac6365f7e239d3d5472807e82de49526e48aeb52
2021-06-28 03:57:57 +00:00
Arc Wang
3625cf50aa Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev 2021-06-28 03:43:59 +00:00
TreeHugger Robot
e7679a06b6 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 46398c4a58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I7ed5146fa41fa50b2e64ac82b9c8276d3b0d3262
2021-06-28 03:43:30 +00:00
TreeHugger Robot
3700019007 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 3e8addbb80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I99bbdd63385d92133b5feda79de2a3f3db29f724
2021-06-28 03:42:57 +00:00
TreeHugger Robot
3e8addbb80 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I8d0dcebbcbc2d7bf4d2e221ffb7eacc96f95df0d
2021-06-28 03:25:07 +00:00
TreeHugger Robot
46398c4a58 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I9f7c5cec36fd05f66f274a6321707ea5c3ef4d47
2021-06-28 03:24:11 +00:00
TreeHugger Robot
0bea498ae1 Merge "Fix switch behavior with switch access" into sc-dev 2021-06-28 03:01:29 +00:00
Arc Wang
465560d388 Shows ripple effect inside CardPreference's rounded rectangle
contextual_card_background is a drawable which shows ripple.
Sets contextual_card_background as the foreground of
MaterialCardView.

Bug: 191617809
Test: manual visual
Change-Id: I09ee886fe56e443626042682381560ed0f32d51d
2021-06-27 15:59:18 +00:00
TreeHugger Robot
1588b767d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours am: d003b5deb2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42eb96272f09a8bb2228a42af5858659be5674f8
2021-06-26 05:27:27 +00:00
TreeHugger Robot
f1a39792c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours am: e78163f7c7 -s ours am: 7fe4564a4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e9553245f300363caef2a3c59aa6dd848afabb9
2021-06-26 05:27:23 +00:00
Bill Yi
2781ab4e3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours am: 6f34ea57ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia46ad1dcbe58428fcf551c5f9454fa4437d9249f
2021-06-26 05:27:19 +00:00
TreeHugger Robot
cd028a9a9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours am: 409be78320 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42273ba1417b997b853e485e600c8a0882e775fd
2021-06-26 05:24:29 +00:00
TreeHugger Robot
119268df3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours am: e78163f7c7 -s ours am: 8c307c4d67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61d9fc85e7ffae0117b69e05423f7402d0603cbc
2021-06-26 05:24:25 +00:00
Bill Yi
43da1b001b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours am: 3cad327a2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9cd1dca4bdf983e95990c82dd8038c46564b877d
2021-06-26 05:24:21 +00:00
TreeHugger Robot
929c3860be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours am: 926cffbbea -s ours
am skip reason: subject contains skip directive

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

Change-Id: If18b947bafefef0be6147d5962cc694616a8713b
2021-06-26 05:24:16 +00:00
Bill Yi
b3ae3367e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours am: 76310b46a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80ce7bc06e042ca031cb14aade3fa094c67e9587
2021-06-26 05:24:12 +00:00
TreeHugger Robot
d003b5deb2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I588d2d6e70e1b14c6678801dc9fd453f6ebe987e
2021-06-26 05:24:03 +00:00
TreeHugger Robot
51fd3b4ae4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours am: cadaadb462 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ea27380501919a7219475dff83ecfc921dd85fe
2021-06-26 05:24:00 +00:00
TreeHugger Robot
7fe4564a4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours am: e78163f7c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c29941351f340836a96211583e67f4371e9ad38
2021-06-26 05:23:59 +00:00
Bill Yi
6f34ea57ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44b519ea49dd847cdd65deb7cf0f9aff23ac2e5c
2021-06-26 05:23:53 +00:00
TreeHugger Robot
e325e43e75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours am: 314dad2e61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib14f62f48d2db8eeea7f2f90d8381e27fd46c680
2021-06-26 05:23:45 +00:00
Bill Yi
1e160aa7df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours am: b994348b19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12a8bb7932a40cdaebe713600f82a9de1c158f45
2021-06-26 05:23:39 +00:00
TreeHugger Robot
d7e98f11bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours am: 83d55613d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9619f166433beeefc2b9d0297c32eab990d453e5
2021-06-26 05:23:32 +00:00
TreeHugger Robot
409be78320 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d3c33dceaeaef72c2a97bdf90543beefd2c75a1
2021-06-26 05:18:42 +00:00
TreeHugger Robot
8c307c4d67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours am: e78163f7c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I032ef821f36de9c3e353e7d90e701016fe1363f7
2021-06-26 05:18:38 +00:00
Bill Yi
3cad327a2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I859a0a0ce773858ce5a32ef9f4f78e236f506c17
2021-06-26 05:18:35 +00:00
TreeHugger Robot
1060b2f926 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 05:16:50 +00:00
TreeHugger Robot
e78163f7c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I582c95f5d4f7e1ae9ec4b3e4914e0ba4891242bb
2021-06-26 05:15:41 +00:00
Bill Yi
4621b36198 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2f670479503f1f1c2aacb2d04d7d0d7c5814cb7
2021-06-26 05:15:33 +00:00
TreeHugger Robot
926cffbbea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I010737d72105e9540992237716af3747f510d440
2021-06-26 05:14:49 +00:00
Bill Yi
76310b46a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib66d41ae033d461f6e26b3c59131eaa03f346df7
2021-06-26 05:14:42 +00:00
TreeHugger Robot
28dbcbf459 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-26 05:13:39 +00:00
TreeHugger Robot
314dad2e61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If3885e81393d34a70ad5b3e34889e3eebdd751f4
2021-06-26 05:12:19 +00:00
Bill Yi
b994348b19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2744c926e9f85a0afe710bc8ba6339c8b30e6db5
2021-06-26 05:12:12 +00:00
TreeHugger Robot
83d55613d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd4615d4087d13d26217b4b941a11df2adc85ae2
2021-06-26 05:12:07 +00:00
TreeHugger Robot
ce6e84f830 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88919988edfdee2caa05df3317f351e903e10f31
2021-06-26 05:11:35 +00:00
Bill Yi
28cd196a94 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54ab7d9f2758a59cf18c6e1cdfb8eebb47a387d9
2021-06-26 05:11:20 +00:00
TreeHugger Robot
cadaadb462 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I044b2c9e790d1418f1c34ebae5d31b849290b3bd
2021-06-26 05:10:49 +00:00
TreeHugger Robot
1b194500c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 82c7e98261 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5319ef42351edad0b3e8f0a35cfb539ecfd4d6c6
2021-06-26 05:02:15 +00:00
TreeHugger Robot
75f02a46d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 347666014d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25babbfa4dc76315ed1294bb7c66f3f1806b6100
2021-06-26 05:01:53 +00:00
TreeHugger Robot
b92673984b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-26 05:01:37 +00:00
TreeHugger Robot
edea8a6799 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 04:58:47 +00:00
TreeHugger Robot
82c7e98261 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-26 04:50:27 +00:00