Bonian Chen
ddda72d975
Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: aaea164675 am: 892bd63eba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410
Change-Id: Ifd3b4a81d965e5164e5ec0859a5e02fbac0f157a
2021-06-28 04:27:13 +00:00
Bonian Chen
c431701061
[automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: b45ea80636 -s ours am: fcb5e44513 -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: I29701c06e6ca2df838f06f518ca04ec756fa7f00
2021-06-28 04:27:12 +00:00
Arc Wang
55f564c6e4
Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 659eb02d2d am: e989bd2b39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781
Change-Id: I6c65d3b7e807a010a7f13ae00d20a13222e99edc
2021-06-28 04:27:04 +00:00
Bonian Chen
60b6ba0400
Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: 80d7c162d6 am: e0667d76d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410
Change-Id: If073eb817eca100018d14900d8d1d44932649321
2021-06-28 04:26:58 +00:00
Bonian Chen
4f4022fb06
[automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: 8e80d83db5 -s ours am: bf0827680b -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: I7d85bac78922b30af4f8b08190cd0149f841716d
2021-06-28 04:26:56 +00:00
Arc Wang
d939150c4f
Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 14920afb08 am: cc4745e44c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781
Change-Id: I43c7a70f6d1d39994c0448b59977cf4e8baa9c15
2021-06-28 04:26:36 +00:00
Bonian Chen
63405687b7
Merge "[Settings] fix for Wifi calling settings page crash"
2021-06-28 04:20:26 +00:00
Jeremy Goldman
3444ee6e0b
Merge "LegacyVpnPreferenceTest added for Vpn settings"
2021-06-28 04:13:38 +00:00
Bonian Chen
892bd63eba
Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: aaea164675
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410
Change-Id: Iada0ebadf897e11d8f8cc9b79d8e3c33df3e4020
2021-06-28 04:13:31 +00:00
Bonian Chen
fcb5e44513
[automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: b45ea80636 -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: Ife5270eb204de173fe31b81a2c78685993c1d169
2021-06-28 04:13:30 +00:00
Arc Wang
e989bd2b39
Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 659eb02d2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781
Change-Id: I03f77f855a49eb02a5e594d10b100616ee230690
2021-06-28 04:13:24 +00:00
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
66c2eb2cb3
Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: f6e9f00332
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410
Change-Id: Ic4f637888de5994653909e543b6796818960ec3c
2021-06-28 04:12:46 +00:00
Bonian Chen
e93c4ce6c4
[automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: f03086e9db -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: I7deb279ce0341ec67af0c104dc5be4177b4d2ebc
2021-06-28 04:12:45 +00:00
Arc Wang
97c231244f
Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: d7a57a59d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781
Change-Id: Ib871f554cc325dbbfa87a6005bd28cbc0dac0187
2021-06-28 04:12:38 +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
f6e9f00332
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: I6888257ca0fb942c1e388448cb71466000bdabe3
2021-06-28 04:03:14 +00:00
Bonian Chen
f03086e9db
[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: Iea5aafb8e04dfbed3c9d3d132508161c31bbecc1
2021-06-28 04:03:12 +00:00
Bonian Chen
aaea164675
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: I43500208af3d17787ad7065cfe05735486ef2cce
2021-06-28 04:02:18 +00:00
Bonian Chen
b45ea80636
[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: I3d56a66613cb0b2a6b187f9be672d9b03f5385a1
2021-06-28 04:02:17 +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
TreeHugger Robot
eef2932bc9
Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 46398c4a58 am: e7679a06b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042
Change-Id: I26e2d2cbb83e34a70594ae0a74e913f0d52a73c4
2021-06-28 03:57:43 +00:00
TreeHugger Robot
47a300c60d
Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 3e8addbb80 am: 3700019007
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042
Change-Id: Ide18b69822f71f39f315e4c85e9f892db3c5ee74
2021-06-28 03:57:25 +00:00
Arc Wang
d7a57a59d6
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: I6ce40af99f6494a915040e662c86ad0e93444110
2021-06-28 03:57:13 +00:00
Arc Wang
659eb02d2d
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: Iadf3b86d87e11e481f5ea7161c5e8c3ab6b0f2bb
2021-06-28 03:56:15 +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
71723830f8
Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 194c2a8c0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042
Change-Id: I0fd2c832c363fbfc012c80e9f29bca0345f96a83
2021-06-28 03:42:33 +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
194c2a8c0a
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: I77608d1b291e07ed8034450b89bb08bf2328d4be
2021-06-28 03:24:15 +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
Bonian Chen
fbe1293a54
[Settings] fix for Wifi calling settings page crash
...
UI crash reported due to accessing telephony framework API with invalid
subscription ID from SIM. Which comes with multiple reason.
Besides of avoidance of crash, following updates are also required:
1. Close wifi calling settings UI when pSIM or eSIM not available or
inserted.
2. Keep the selection of tab (under multi-SIM) when screen rotate
3. Only show 1 SIM when multi-SIM are grouped together
Bug: 149190278
Test: local
Change-Id: Ied9a088b6ee5da66972f27649cc07f4a31304f17
2021-06-27 14:11:54 +08:00
TreeHugger Robot
84a4983da0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours am: d003b5deb2 -s ours am: 1588b767d8 -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: I941050d9d84a9de1c7b5984d81789093bfd76e40
2021-06-26 19:50:58 +00:00
TreeHugger Robot
2033adc4bb
[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: f1a39792c7 -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: I2089d94512dba313fbd70b30f39325f16bf0c6b7
2021-06-26 19:50:39 +00:00
Bill Yi
895a9228e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours am: 6f34ea57ff -s ours am: 2781ab4e3b -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: I7fba6764d4556a38f329072b9e5086767e05ba85
2021-06-26 19:50:20 +00:00
TreeHugger Robot
f878a5aeb0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours am: 409be78320 -s ours am: cd028a9a9a -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: Ic33ffcaeb80f4b30455a3a63162eb5d14eb886bc
2021-06-26 19:49:41 +00:00
TreeHugger Robot
a44fabb50f
[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: 119268df3b -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: Ie247c4ed85b034fc38a76acd6559d9986954c5f4
2021-06-26 19:49:26 +00:00
Bill Yi
6b5299fe7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours am: 3cad327a2a -s ours am: 43da1b001b -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: Ie3a4c47294d45aaf1d82f3b9f5154d980f037fe8
2021-06-26 19:49:07 +00:00
TreeHugger Robot
2dfa64f8c8
[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: 929c3860be -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: I9b4c35445bd11fa8cbd6591fcf25bcd724dbebe6
2021-06-26 19:48:28 +00:00
Bill Yi
067e756531
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours am: 76310b46a4 -s ours am: b3ae3367e7 -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: I22b51014aac059a336624e5aca2aa753c43454b6
2021-06-26 19:47:50 +00:00
TreeHugger Robot
f684380ba2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours am: cadaadb462 -s ours am: 51fd3b4ae4 -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: I0052bbe4330728939385e251c3dce0f6cf961dc1
2021-06-26 19:46:44 +00:00
TreeHugger Robot
2ae4f4d521
[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: e325e43e75 -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: I3cd4068b126cbf54789a0d8dafdeba0a1b700568
2021-06-26 19:45:24 +00:00