Peter Kalauskas
82f54ab85d
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 6804d23658
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: If357e1ed1924ea52530d2ed5de363469f99b85ec
2021-07-26 15:23:41 +00:00
Peter Kalauskas
b264d3a9af
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: a7f2f06bd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: I348926ec96c0feea6ae941f6e7bf6aef4fd231ae
2021-07-26 15:23:19 +00:00
Peter Kalauskas
3a8d2b2fef
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
am: 3f3c7b7762
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: If85253c1d6ed28e12cf3f8156e83c6f8eb7c14d4
2021-07-26 15:19:27 +00:00
Peter Kalauskas
6804d23658
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: I72de49d2efd13e19160a5387bd7947e111e5aa27
2021-07-26 15:09:41 +00:00
Peter Kalauskas
a7f2f06bd4
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: Icca5f3cbe2ba979636938b90acbfa1598b8d678d
2021-07-26 15:08:31 +00:00
Peter Kalauskas
3f3c7b7762
Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999
Change-Id: I6084b5f8ec7e7a07afede1594d3a302974165c74
2021-07-26 15:07:10 +00:00
Peter Kalauskas
c9076d3d36
Merge "Fix: change owner name when account setup" into sc-dev
2021-07-26 14:52:29 +00:00
TreeHugger Robot
0b7c5ed31c
Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget"
2021-07-26 09:55:14 +00:00
Weng Su
658a417205
[Provider Model] Correct the Settings shortcut of the Settings Widget
...
The Settings is used the "Internet" settings instead of "Wi-Fi" settings
after Provider Model enabled.
The Settings shortcut of the Settings widget should update below.
- Remove "Wi-Fi" shortcut from the Settings widget
- Correct the "Network & internet" shortcut to "Internet"
Bug: 194644851
Test: manual test
atest -c SettingsUnitTests
make RunSettingsRoboTests
Change-Id: I488327a01f5e539ecbe315b7016f65084dfd59a1
2021-07-26 16:33:31 +08:00
Bonian Chen
4f2a97987b
Merge "[Settings] Allow disabled SIM to be controlled in UI"
2021-07-26 05:00:12 +00:00
TreeHugger Robot
6a73dba20a
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7364b38193
am: 7303f135f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I639b43d233d7308dcca17d1676e448bf718d29c6
2021-07-24 19:22:45 +00:00
TreeHugger Robot
7e65417b97
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7993875a8e
am: 923b048d73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I9baf1c9499e8b2bff6a96f503f5e605ca67cb53c
2021-07-24 19:22:38 +00:00
TreeHugger Robot
7303f135f9
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7364b38193
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I9597670776e93d68ca062e9e934b5a5c93460dac
2021-07-24 19:12:42 +00:00
TreeHugger Robot
923b048d73
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 7993875a8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: Iedd478cd368b79d2bc1c409da28cbf20ca9bafc7
2021-07-24 19:11:53 +00:00
TreeHugger Robot
20948a6bac
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
am: 2db28ba980
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I8b44af8077061db5ef3c3c4fae48762e1afe8787
2021-07-24 19:11:28 +00:00
TreeHugger Robot
7993875a8e
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I29147e9d2400dbdccde9c63f15deb79240a2dd66
2021-07-24 19:00:27 +00:00
TreeHugger Robot
2db28ba980
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I866551841738574d0073639bd9b3ffa8856d9aba
2021-07-24 18:58:52 +00:00
TreeHugger Robot
7364b38193
Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629
Change-Id: I3979eea6816ff8f6cf37f698b6015f87b4b0d4e9
2021-07-24 18:58:49 +00:00
TreeHugger Robot
ae23247270
Merge "Use correct user ID for face bypass pref controller" into sc-dev
2021-07-24 18:46:18 +00:00
Curtis Belmonte
43f2be2059
Use correct user ID for face bypass pref controller
...
Ensures that the lockscreen bypass preference toggle shown on the face
unlock settings screen always uses the correct user ID. This fixes an
issue where the preference toggle for a guest user would use the
primary user's setting when multiple biometrics are supported.
Test: Manual:
1. Turn on Settings > System > Multiple users > Use multiple users
2. Add a guest account and switch to it
3. Enroll a face for Face Unlock on the guest account
4. From the Face Unlock settings screen, toggle "Skip lock screen"
5. Ensure that face bypasses lock screen iff this toggle is on
6. Switch back to the owner account and repeat steps 3-5
Fixes: 193488905
Change-Id: I2da4ce466fe0446cccc9119c90bd322daf627339
2021-07-24 09:20:08 -07:00
Bonian Chen
847f326cd4
[Settings] Allow disabled SIM to be controlled in UI
...
Disabled SIM are hidden from UI due to the API only check if there's a
SIM with mobile data capability active within device.
Right now, the UI design has been changed. The UI here should be
accessible no mater with or without the support of mobile data.
Bug: 193820245
Test: local
Change-Id: I9c8b8fa16e74cd0fe4419966cc97ad55b5b87b17
2021-07-24 14:42:37 +00:00
Tom Hsu
022d61cee8
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 50cacb7ef4
am: 82a0d44bc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I268258e90a74bea8c60d562cc090a422d6231ff5
2021-07-24 07:11:40 +00:00
Tom Hsu
323a5cc0e2
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 10af4a87fb
am: b114cda66f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I4e1ac5b9253011721b49dc95aa5b59198bc76cac
2021-07-24 07:11:32 +00:00
Tom Hsu
82a0d44bc4
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 50cacb7ef4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I740ea44f427047f1b8bd2a682f66b58ff91513f7
2021-07-24 06:59:48 +00:00
Tom Hsu
b114cda66f
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 10af4a87fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: If1f5f714eee5f7461033c94ffc7b3c5d3abb42a8
2021-07-24 06:54:47 +00:00
Tom Hsu
6930afb83e
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
am: 4f3957614f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: Ied4c7301c8387cd220603dd52226303ebba7c06f
2021-07-24 06:53:39 +00:00
Tom Hsu
50cacb7ef4
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I96fa216a724ac84aeb9f8eba05c1d709fc9e701d
2021-07-24 06:42:40 +00:00
Tom Hsu
4f3957614f
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: I2ed737674321b7f923952562f0f1c82a38fca4af
2021-07-24 06:41:27 +00:00
Tom Hsu
10af4a87fb
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364
Change-Id: Ie33f9ae9cb7dfe13562b67010a8b56cf8941a288
2021-07-24 06:41:01 +00:00
Tom Hsu
d3d3161695
Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev
2021-07-24 06:32:37 +00:00
tom hsu
01f43ff290
[Settings] Fix problem that MobileNetworkActivity show wrong Info.
...
- UiccSlotInfo only provide current active slots. It doesn't provide
inactive slot. Thus,it should not use it for checking sim existed.
Bug: 194022251
Bug: 194378040
Test: Maunal test
Change-Id: I00a3fcf3f700bee804bad12039d6d13a1404cc74
2021-07-24 05:34:07 +00:00
TreeHugger Robot
8321cd2d72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours am: 9e9c9abad7
-s ours am: 53c5eaa459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: I8b56cf81cad6c9fbd40ca9ff8cd6dbda986e6fd4
2021-07-24 02:57:42 +00:00
Bill Yi
fb34226e36
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours am: aa1a97f80b
-s ours am: f02852b3bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: I925f9cc35b7d7e1ce31ee5cb1254cfead17140f8
2021-07-24 02:57:38 +00:00
TreeHugger Robot
0594b87192
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours am: 231062e17d
-s ours am: cab4d77dba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: Ia2d2381ce02753ca43007539ea12ed43444664c9
2021-07-24 02:57:33 +00:00
Bill Yi
0d9775e3a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours am: 4fa6d75375
-s ours am: db6ade8812
-s ours am: 56754090b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: I5eb38952270726ce1281341292b51d7069701448
2021-07-24 02:57:29 +00:00
TreeHugger Robot
4bbd1ef20f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours am: dfd6de3b5c
-s ours am: b1dc25cc5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: Ic85a04bd05b5e76674da55a7421a3ee7e032e935
2021-07-24 02:57:25 +00:00
Bill Yi
3800a4d55b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours am: a29cd257d8
-s ours am: 12ca57f7d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: I32023e173033b60eceee0ca6fa1d38420cd04c39
2021-07-24 02:57:21 +00:00
TreeHugger Robot
4299f63fc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours am: a0bb0ff019
-s ours am: 596064c104
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I6bb8f36a99b156959f0929e62983266d90e0bb77
2021-07-24 02:57:17 +00:00
Bill Yi
bd0b35e9bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours am: 4fa6d75375
-s ours am: 7da3c35dbc
-s ours am: f418dbc6ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: I0dac4478d4ccc929a500ddc48f0fb348eb091fce
2021-07-24 02:57:12 +00:00
TreeHugger Robot
5202725f5c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7dd70398eb
-s ours am: 7c90f57be4
-s ours am: 349d8dff7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379614
Change-Id: Ie30a119b60b8a94a9d20be7d4c20943387eaa961
2021-07-24 02:57:04 +00:00
TreeHugger Robot
711616df1a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bfd21817e8
-s ours am: 0d3f23e0bb
-s ours am: f15268536c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379618
Change-Id: I3bc24b7023bdafb2288f32f6c7c106f399183a5f
2021-07-24 02:56:55 +00:00
TreeHugger Robot
00cbcb8f3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7dd70398eb
-s ours am: ef50a1ed15
-s ours am: 030df64861
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379614
Change-Id: I284539b856e849fd06bf10ab16ef88181536d228
2021-07-24 02:56:51 +00:00
TreeHugger Robot
eb7ad72ad8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bfd21817e8
-s ours am: 39f0224620
-s ours am: b9ba302c9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379618
Change-Id: I2e4ea49b4da1b99b10fde6db4c13fdcce0214fee
2021-07-24 02:56:11 +00:00
TreeHugger Robot
53c5eaa459
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours am: 9e9c9abad7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: I570f725b7a09efbe17e10fa26c6df39580a90b1d
2021-07-24 02:44:52 +00:00
Bill Yi
f02852b3bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours am: aa1a97f80b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: Ibc53f8bf4f8f41721c8aaea4ec22182c28d380e6
2021-07-24 02:44:48 +00:00
TreeHugger Robot
cab4d77dba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours am: 231062e17d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I79125a0c22380377f0742f35625e15c1098678bf
2021-07-24 02:44:45 +00:00
Bill Yi
56754090b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6
-s ours am: 4fa6d75375
-s ours am: db6ade8812
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375149
Change-Id: I76eb629be9e4d349e35ba049bfb9d96d61838433
2021-07-24 02:44:41 +00:00
TreeHugger Robot
b1dc25cc5a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48
-s ours am: 2308651946
-s ours am: dfd6de3b5c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15378000
Change-Id: Idfe23a4c202d0fc66a6b0a7006c953e88f88c6db
2021-07-24 02:40:37 +00:00
Bill Yi
12ca57f7d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27
-s ours am: 9de075b836
-s ours am: a29cd257d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15375146
Change-Id: I5c4a458ddcf73bb50c730cde8bc5370b6258f239
2021-07-24 02:40:33 +00:00
TreeHugger Robot
596064c104
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1
-s ours am: e34a6626b3
-s ours am: a0bb0ff019
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379611
Change-Id: I4dc9b9887f8efc1bc10cff304d88ad660693dcc7
2021-07-24 02:40:27 +00:00