Bill Yi
fabbcac444
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours am: 10d16d80c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I634adacba1a60a1e2a0030dcba965b009f1f1e33
2021-12-01 18:09:21 +00:00
Bill Yi
8b7ed642d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours am: ae32f7324b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: I6fe074fb6d2ecf6abe738dee96588d5684bfcd6e
2021-12-01 18:07:49 +00:00
Bill Yi
0845cbd1b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours am: 4844909fbe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I75518960030ce5b91a026b0b7adc08f1ca375a82
2021-12-01 17:22:30 +00:00
Bill Yi
7b332c2f5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours am: 887f2b7e02
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: I285f04d126e007e4f17045d0a16092c022ffdc9b
2021-12-01 17:21:17 +00:00
Bill Yi
10d16d80c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: Iea8f622284dc73d2d089d57bc285445c1cbaa2cd
2021-12-01 17:20:34 +00:00
Bill Yi
ae32f7324b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: Ie62fe7a31ad3a11650aa423c0f1b3a6abbe7e23b
2021-12-01 17:19:22 +00:00
Bill Yi
4844909fbe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours am: 7946a90b42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I31222683be6f79243f3ba10c325192ad7528d21d
2021-12-01 17:19:19 +00:00
Joshua Mccloskey
e372b2a22b
Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490
Change-Id: I9a4e565b311d7a65091aca5294879366b9399265
2021-12-01 17:19:04 +00:00
Bill Yi
887f2b7e02
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3c701077
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16357024
Change-Id: I176834d8b4dd5c41bb9514a5d998699d202652a3
2021-12-01 17:18:27 +00:00
Bill Yi
7946a90b42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e754d6891
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I6bda0cb874bb45735cda3852876ace5d8eef1635
2021-12-01 17:18:20 +00:00
TreeHugger Robot
3042f4621d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 83fede5908
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356719
Change-Id: I777b93480c0cde0d38aaf9e9d17a4c0992a702dd
2021-12-01 17:17:48 +00:00
Joshua Mccloskey
1ca42ffc79
Merge "Disable setting if sensor is convenience." into sc-v2-dev
2021-12-01 17:09:50 +00:00
TreeHugger Robot
83fede5908
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-12-01 16:59:42 +00:00
Tsung-Mao Fang
e6a79f0670
Update background color for two-pane mode am: 395ea90b83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16282524
Change-Id: I2b4fffda97aaec53945c4de4cf6248fb81163e64
2021-12-01 10:22:01 +00:00
Tsung-Mao Fang
395ea90b83
Update background color for two-pane mode
...
Update background color for status bar and
homepage background programically.
Also, we update the backgroud color for highlight items.
Test: Rebuilt apk and see the screen.
Bug: 195293058
Change-Id: Id100f8c9c7fc02c43420afcca07a703a14ec2312
2021-12-01 16:39:09 +08:00
Zoey Chen
4aef8765dc
Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786
Change-Id: I1a63b9d82fd530af87c2c70ab21e24e599a967e2
2021-11-30 08:46:59 +00:00
Zoey Chen
1df187a439
Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev
2021-11-30 08:33:50 +00:00
Zoey Chen
8b1ecea060
[Settings] Should show carrier network if airplane mode is on
...
https://hsv.googleplex.com/6007361661566976
Test: atest SubscriptionsPreferenceControllerTest
Bug: 206990845
Change-Id: Id39b662f33b201a8e4ce53c34c3007eca9a40edf
2021-11-30 12:10:28 +08:00
Joe Bolinger
77556bcc51
Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466
Change-Id: I08041af311deb454a3f05b9328955b6489a8f35a
2021-11-29 23:26:27 +00:00
Joe Bolinger
076dc5ee1b
Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev
2021-11-29 23:15:15 +00:00
Bill Yi
12a5d03d9f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic0a4b094fdd4f7898eb3726ba17b23a3563acb2a
2021-11-29 08:56:17 +00:00
Bill Yi
1b3c701077
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic270445cc1d57212de38787fab18a2d7ce937cca
2021-11-29 08:52:04 +00:00
Bill Yi
8e754d6891
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3e347bcbdb1bda52690caa9ead4a9c913c8e990
2021-11-29 08:48:23 +00:00
Bonian Chen
12287b2c67
Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970
Change-Id: I37fd544ef7452a3286dd393d68407d626d9ab590
2021-11-29 06:23:02 +00:00
Bonian Chen
1026e410f4
Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev
2021-11-29 06:05:40 +00:00
TreeHugger Robot
c6bc7a7c4b
Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784
Change-Id: Ib37dab22b51da7ec97990230a17b7fe698abee60
2021-11-29 05:59:08 +00:00
TreeHugger Robot
cd8a01d2fd
Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev
2021-11-29 05:37:34 +00:00
Charles Chen
181853efb0
Fix different behaviors of deeplink in one/two pane am: a8c97980a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785
Change-Id: Ie2833c5b9b4f0f05a97432198a949050d3fb3e84
2021-11-29 05:02:31 +00:00
Treehugger Robot
96d33dbdbe
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
am: ad041d78ee
am: 7e7b1f720e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
2021-11-29 04:44:02 +00:00
Treehugger Robot
7e7b1f720e
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
am: ad041d78ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: I45b1aa93de3633b6fe2ec8b0605fbeac5a4f3d37
2021-11-29 04:27:25 +00:00
Treehugger Robot
ad041d78ee
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: Icc8ed52e3eeaa0aefe4ccc0e65440e58cb0faedd
2021-11-29 03:58:28 +00:00
Treehugger Robot
e41d1b9761
Merge "Minor clean-up for LE audio setting"
2021-11-29 03:41:49 +00:00
Treehugger Robot
afa860da18
Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
am: 0a69b346c8
am: ff1ebb31d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: I8273612ded6c7f489baec255a8872e5ebb301741
2021-11-29 03:04:16 +00:00
Alice Kuo
2d0025761b
Handle csip set member automatic pair in Setting am: 629611a43e
am: eb412a0614
am: 6097f9b830
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834
Change-Id: Icace2cf11100209eaa945971704b3319e9628e75
2021-11-29 03:04:15 +00:00
Alice Kuo
3d17582b0b
Do not update the previously connected devices for the sub device am: c78fb83aee
am: f6f0126b8e
am: 1da3264140
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833
Change-Id: I4e83de75cd61c7f3fcf418bfdefc79d655c063f9
2021-11-29 03:04:13 +00:00
Alice Kuo
31e82a325c
Accept the pairing request automatically for the set member pairing am: 61460a1ab1
am: 6aa53808f3
am: c932678888
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832
Change-Id: I205a7824d84a42128be5be2e77974689510d190a
2021-11-29 03:04:12 +00:00
Alice Kuo
2240418de8
Show the multiple Mac address for the coordinated set am: 9f11a4cddf
am: f0b73dade7
am: e3680e211a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831
Change-Id: I126e164160dae141978a59b02cea9f0091b7265f
2021-11-29 03:04:10 +00:00
Alice Kuo
6943c0356c
Add the pairing string for CSIP supported device am: f57f720c38
am: 5d1aee76c2
am: 2135db2eac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830
Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
2021-11-29 03:04:07 +00:00
Treehugger Robot
ff1ebb31d4
Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
am: 0a69b346c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: I6cbdf1b5d405aceb82b4714b4d8101a1f33de239
2021-11-29 02:48:47 +00:00
Alice Kuo
6097f9b830
Handle csip set member automatic pair in Setting am: 629611a43e
am: eb412a0614
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834
Change-Id: Ibb8140b8af96036750457a6866eb9ba410bc0b84
2021-11-29 02:48:46 +00:00
Alice Kuo
1da3264140
Do not update the previously connected devices for the sub device am: c78fb83aee
am: f6f0126b8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833
Change-Id: I2f2bf3cac4b0712b8e06beb84b15e6647ccb3130
2021-11-29 02:48:46 +00:00
Alice Kuo
c932678888
Accept the pairing request automatically for the set member pairing am: 61460a1ab1
am: 6aa53808f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832
Change-Id: Ic7bc92ee8409a22c74e701b0a7b52d841fc12a4d
2021-11-29 02:48:45 +00:00
Alice Kuo
e3680e211a
Show the multiple Mac address for the coordinated set am: 9f11a4cddf
am: f0b73dade7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831
Change-Id: I65a4d227e8f92b155636d8aa51b4e5e83bac2b3d
2021-11-29 02:48:44 +00:00
Alice Kuo
2135db2eac
Add the pairing string for CSIP supported device am: f57f720c38
am: 5d1aee76c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830
Change-Id: I51ff75f8a8005985a9696616edd1c8c5cdd651fe
2021-11-29 02:48:43 +00:00
Treehugger Robot
0a69b346c8
Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: I1e70974396efc1eaf4e389cc35a2789849e696af
2021-11-29 02:29:32 +00:00
Alice Kuo
eb412a0614
Handle csip set member automatic pair in Setting am: 629611a43e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834
Change-Id: If9172095a2688a0fbe588ccbae96076e9cf8b133
2021-11-29 02:29:32 +00:00
Alice Kuo
f6f0126b8e
Do not update the previously connected devices for the sub device am: c78fb83aee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833
Change-Id: I3c062b23b8772496cb149ad1eff8483836a79289
2021-11-29 02:29:31 +00:00
Alice Kuo
6aa53808f3
Accept the pairing request automatically for the set member pairing am: 61460a1ab1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832
Change-Id: I2cce585de893512005af7abf35f5729351512cea
2021-11-29 02:29:30 +00:00
Alice Kuo
f0b73dade7
Show the multiple Mac address for the coordinated set am: 9f11a4cddf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831
Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2
Add the pairing string for CSIP supported device am: f57f720c38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830
Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
2021-11-29 02:29:27 +00:00