Pavel Grafov
3a48226af1
Merge "Launch ForgotPasswordActivity in a new task."
2021-11-30 14:47:22 +00:00
Bonian Chen
010306644b
[Settings] Refactor Wifi Calling description text
...
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.
Bug: 204844012
Test: local
Change-Id: Ie89a5b65e75cdd61fab68c6e1bf7c40bfcc68b6b
2021-11-30 13:57:56 +00:00
Bonian Chen
8a892271da
[Settings] Refactor Wifi Calling description text
...
Refactor the display of description text when no wifi calling options available.
Enhancement:
1. These text need to align the style with the summary part of the wifi
calling options.
2. These text need to be scrollable in order to see full description.
3. The link within text need to be clickable.
Bug: 204844012
Test: local
Change-Id: I60f339bf4adf50236d80176669a557c77f0d97ca
2021-11-30 13:55:55 +00:00
Bonian Chen
3dfad58897
[Settings] support of getPhoneNumber API
...
Access to new API for retrieving phone number.
Bug: 208321353
Test: local build pass
Change-Id: I8484f94934670f24c80c95df89e8752420c1f439
2021-11-30 11:04:38 +00:00
Zoey Chen
3581f65d85
Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439
am: 4aef8765dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786
Change-Id: Ic4648dad4fd7950510fea2382fa990efe900baf8
2021-11-30 09:05:10 +00: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
Joshua Mccloskey
b73201c6be
Added sensorPrivacyDialog to face settings
...
Test: Verify flow presents dialog if the privacy setting is enabled.
Bug: 201045056
Change-Id: I96f14db457311d13f07c770ff0993581576c5dba
2021-11-29 23:09:16 -08: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
54b4689e5a
Merge "Remove face auth from setup wizard when configured as a convenience." into sc-v2-dev am: 076dc5ee1b
am: 77556bcc51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16325466
Change-Id: I9c84fbac19a764c012168110db04832a4bf58e92
2021-11-29 23:46:30 +00:00
Andrew Zeng
c71fe8cab1
Remove unncessary constraintlayout-solver deps
...
This will be cp'ed to master later
Bug: 192617148
Test: compiles
Change-Id: Id7a9cf6c26ff9dd464d8f0b0f012b8480ca70b92
2021-11-29 23:32:10 +00: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
Adam Bookatz
cd429e74db
Merge "Use UM.canAddMoreUsers and UM.isUserTypeEnabled"
2021-11-29 21:00:48 +00:00
Etienne Ruffieux
6a709815df
Merge "Refactor Bluetooth scan mode APIs"
2021-11-29 20:27:45 +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
51d79ee306
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
2p: 8ab551fd7b
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I09df0851051109032b5c680c17662624d2343f59
2021-11-29 08:48:45 +00:00
Bill Yi
8ab551fd7b
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8e754d6891
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16356908
Change-Id: I9cee529fb54682d0da69c6c39e1748cb8860d4a9
2021-11-29 08:48:32 +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
Bill Yi
c6e402faa7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I45e746ac351c77ae6c6134c19dd7c778b382e945
2021-11-29 08:44:20 +00:00
Bill Yi
5a725a5b0b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4bce9132bb3c7cb7736faa4e659bbaf217a90596
2021-11-29 08:33:28 +00:00
Bonian Chen
75a5bdaa29
Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410f4
am: 12287b2c67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970
Change-Id: I2b908084e6422e9ccbdba8fd5cf67bf123f3ec62
2021-11-29 06:45:21 +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
TreeHugger Robot
fb0ca145aa
Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd
am: c6bc7a7c4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332784
Change-Id: I8c1f0b3a19239f85a4f67b53dd703ed7a9d3a625
2021-11-29 06:15:11 +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
a1c4d9b702
Fix different behaviors of deeplink in one/two pane am: a8c97980a6
am: 181853efb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16339785
Change-Id: I8b990e14ceb2dce116d74dd670d36072d179555d
2021-11-29 05:20:52 +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
689086b230
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
am: ad041d78ee
am: 7e7b1f720e
am: 96d33dbdbe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: I0afc38c63069b8a1ad43e50e4f39a3d8a77438a9
2021-11-29 04:56:43 +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
a38e83e80a
[automerger skipped] Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
am: 0a69b346c8
am: ff1ebb31d4
am: afa860da18
-s ours
...
am skip reason: Merged-In I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8 with SHA-1 fa0aec49e3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: Ib67c1dad9fbe0ca14506c19bc1c2d0b8e3f45074
2021-11-29 03:19:23 +00:00
Alice Kuo
9bc8b1450d
[automerger skipped] Handle csip set member automatic pair in Setting am: 629611a43e
am: eb412a0614
am: 6097f9b830
am: 2d0025761b
-s ours
...
am skip reason: Merged-In Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9 with SHA-1 ebea73e36b
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834
Change-Id: Ifc808ce832f9c35cf442f561abebe2520e51df85
2021-11-29 03:19:21 +00:00
Alice Kuo
b15a241343
[automerger skipped] Do not update the previously connected devices for the sub device am: c78fb83aee
am: f6f0126b8e
am: 1da3264140
am: 3d17582b0b
-s ours
...
am skip reason: Merged-In I03dfdc25b57e614194fb8de2c9265edd50760d30 with SHA-1 a6d549fee3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833
Change-Id: I525a8b4366da12423d27b38a1be851d2a6e5ac41
2021-11-29 03:19:20 +00:00
Alice Kuo
4283b7c1dc
[automerger skipped] Accept the pairing request automatically for the set member pairing am: 61460a1ab1
am: 6aa53808f3
am: c932678888
am: 31e82a325c
-s ours
...
am skip reason: Merged-In I40afabb09b4cb12a0253035452c9f6974799ed05 with SHA-1 e920efeb3a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832
Change-Id: Ie0d87b73b8df1a6f0fea8e0f4bc0c09778abfe10
2021-11-29 03:19:19 +00:00
Alice Kuo
4c9912b73b
[automerger skipped] Show the multiple Mac address for the coordinated set am: 9f11a4cddf
am: f0b73dade7
am: e3680e211a
am: 2240418de8
-s ours
...
am skip reason: Merged-In I01e0ec91e5c856481318d6435d174b5a2018d820 with SHA-1 133c2cc1cc
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831
Change-Id: I0256cff2f3398b684ba78dd9a1c945575f376351
2021-11-29 03:19:17 +00:00
Alice Kuo
14be1d377e
[automerger skipped] Add the pairing string for CSIP supported device am: f57f720c38
am: 5d1aee76c2
am: 2135db2eac
am: 6943c0356c
-s ours
...
am skip reason: Merged-In I5432b7264652dd4485e2669f6004caa4f7459238 with SHA-1 02cadb9b32
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830
Change-Id: Ie17bf43f8755ead22ff544be33dca53a8e73978c
2021-11-29 03:19:16 +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