Bill Yi
e8c0397e8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I91096d91de1b1556306446a40455d093faec87b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:55:43 +00:00
Bill Yi
fbf554e66e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I94c794e5c7065d881be7d7888f4223fd5fdf0491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:54:19 +00:00
TreeHugger Robot
acfcea73dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3d8b8de2be -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858727
Change-Id: Ic81a305a14b67c6dee86c01adf22d39c3f8fe406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:53:50 +00:00
Bill Yi
c84af9d59e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a3ba24088 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858727
Change-Id: I6638f5c94ff915852ac60c896cc674ace9fd8294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:53:30 +00:00
Bill Yi
74c33f1900
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77b66b7495 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856822
Change-Id: Iab06f8eeb6fbb083bf61c65fa088b65dfffa614a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:53:17 +00:00
TreeHugger Robot
3d8b8de2be
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-06-13 16:40:31 +00:00
TreeHugger Robot
8122edc9ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-13 16:40:03 +00:00
Bonian Chen
03da62810c
[Settings] Avoid from close dialog when touch outside.
...
Roaming confirmation dialog might get closed when touch outside,
which is easily been triggered when having a large screen.
Solution: avoid from close dialog when touch outside of dialog area.
Bug: 235183999
Test: local
Change-Id: Ic312d80e6f04cb8f323ebc713eef4e15257de358
2022-06-13 20:55:32 +08:00
SongFerngWang
e63dfcbd90
[MEP] Modify the comments
...
Bug: 235792308
Test: build pass
Change-Id: Idf0ce19814ce8b23bc1eea864b36815203069f87
2022-06-13 18:24:30 +08:00
SongFerngWang
56e1297abe
Unable to enable the removable esim
...
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.
Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
Merged-In: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-13 17:49:00 +08:00
SongFerngWang
887bb592c8
Reuse the active esim slot
...
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.
Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
Merged-In: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
2022-06-13 17:48:34 +08:00
SongFerngWang
faf9baf95b
stop show preferred SIM card dialog during sim switch
...
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
Merged-In: I242402e49b267c8cd61a85a46367c778d2d8bbf8
2022-06-13 17:48:24 +08:00
Jason Chiu
ae1c17bd0f
Add "smallestScreenSize" into homepage activities
...
The Settings home activity was initially launched in full-screen size,
and then resized in order to be displayed with another placeholder
activity size-by-side.
After ag/18668447, the smallest screen width dp configuration of the
activity was changed to half of the screen size (vs. the fullscreen
size) while embedding.
Therefore, the system updates the configuration changes using
CONFIG_SMALLEST_SCREEN_SIZE, which the Settings home activities didn't
declared. This makes Settings show the full-screen home layout in
dual-pane mode.
Fix: 235449822
Test: visual, robotest
Change-Id: I801ff5fb20b2a42c94223a6edd4af08b67e7f4e9
2022-06-13 06:44:22 +00:00
Yichi Chen
e190a8a5bb
Restore the density when it has been overridden
...
When the density is overridden, the new density remains the same during
the resolution changes, which causes improper DPI on the screen. The
patch recalculates the suitable overridden density when the resolution
is changed and applies the new settings when the new resolution takes
place.
Bug: 233698163
Test: Switch resolution with customized density
Change-Id: I0914de61da0ab3b78380b355f47dbd3052079492
2022-06-13 12:31:31 +08:00
Bill Yi
7b831dc400
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie29078a0f8a50a373604db8dbd4fd2272426add7
2022-06-11 13:26:42 -07:00
Bill Yi
3a3ba24088
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I417d9be4714e60a9e7a36c56e7bd9c8fbb620a89
2022-06-11 13:22:08 -07:00
Bill Yi
e006e9823d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81a6f90e03513ab441888db3316d4b612b3a72ca
2022-06-11 13:17:41 -07:00
Bill Yi
77b66b7495
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id13eb722fe69d4c571cfa68c8fe1fa729e218a38
2022-06-11 13:07:25 -07:00
Bill Yi
154b913f4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
2022-06-10 21:43:26 -07:00
TreeHugger Robot
ae6f2b0e94
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 45580a02a4 am: 4ab4d68f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I37991dc27e8b3cdf0de9073cffba1d1999ceacde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 22:07:59 +00:00
TreeHugger Robot
b27106a131
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c am: 4091170456
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I35907ff13a355fb36cb7ba520d9c366967d37e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 22:07:27 +00:00
TreeHugger Robot
9aa37e4434
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c am: 5f50ce04f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: If0c6ecb6ae28407e3f8e975ecc992b7581773454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 22:05:21 +00:00
TreeHugger Robot
4ab4d68f60
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 45580a02a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Id674f125687fc60af9359a95b2852cbbc33d4a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:32:24 +00:00
TreeHugger Robot
4091170456
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Iaa080b1ba55ad24a174edb5907a5b3fe7dd78584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:32 +00:00
TreeHugger Robot
5f50ce04f1
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I03e4dcfe1a635099d1f13026d1d6a9d21b2348a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:05 +00:00
TreeHugger Robot
063e34e53c
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I48f417627a248636a9aecf0b3a25d9f0ce45eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:39:13 +00:00
TreeHugger Robot
45580a02a4
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Ic7f0628f3ef18ee92733fee88e21242a1424c62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:37:28 +00:00
Automerger Merge Worker
12e7db6478
Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9" into tm-d1-dev-plus-aosp am: 4b1b519a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I7d6ec073481c07d8e59f61bd10b3a572d793c7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:28:51 +00:00
TreeHugger Robot
0e2bc2d45a
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e am: 863843c7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: Ic9f3f0e2544a456fef1ddf1e7b9d39092535bd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:28:40 +00:00
TreeHugger Robot
f20d28e0c3
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e am: 7fb0500aa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I8c69d810b6544dc86f8bf69b6e53214cbd5cc4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:27:55 +00:00
TreeHugger Robot
1c45e9ad72
Merge "Update fingerprint removal dialog strings" into tm-dev
2022-06-10 20:09:03 +00:00
Automerger Merge Worker
4b1b519a92
Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9" into tm-d1-dev-plus-aosp
2022-06-10 19:58:41 +00:00
TreeHugger Robot
863843c7b0
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I80e67d73410150349c3501001c3b8d2252dfe4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:38 +00:00
TreeHugger Robot
7fb0500aa8
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I14e635b309b81f636043f550e01e185c4839dd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:36 +00:00
TreeHugger Robot
661c13a194
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: If4f9c33086ac7d1041e073a63214c33390b575ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:33 +00:00
Milton Wu
b6fbd10af4
Merge "Update SUW fingerprint string" into tm-qpr-dev am: 75d49b02bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753041
Change-Id: I61ce4d033c1f4cfa57347ad781c2ecbce4da20de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:40:24 +00:00
TreeHugger Robot
3b2fe3e89e
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I11486349b04ce9af7004e6761e6d419e4892baf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:56:02 +00:00
TreeHugger Robot
f7b4e4adc9
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I6c28e8ad8fc8e97cf1f6c5c290562f7b6dda4821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:54:24 +00:00
Milton Wu
75d49b02bc
Merge "Update SUW fingerprint string" into tm-qpr-dev
2022-06-10 17:33:44 +00:00
TreeHugger Robot
fc45c25296
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev
2022-06-10 17:25:25 +00:00
Joshua Mccloskey
ee1b2589ec
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 06b76edbb7 am: e634c8e1ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I4946ea1efc7c4093bcacac9ad62e31a3df739a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:05:31 +00:00
Joshua Mccloskey
0e7a40a699
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a am: 6f430f8e66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I91b535902a62cc4726581ab8209a4d0d66620cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:05:25 +00:00
Joshua Mccloskey
e634c8e1ed
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 06b76edbb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: Ic384140de7b6166a126a2afad2396175a4c7d4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:05:14 +00:00
Joshua Mccloskey
083125dff3
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17 am: 9f1af4fc86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: I7797f6c9d3a139374b211855c1bedfda9393046b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:04:03 +00:00
Joshua Mccloskey
74d3ba859f
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a am: 62db0f71bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: Ide094dbadfbaa9fcbb5aefbf8c31523ae00d0184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:03:54 +00:00
Joshua Mccloskey
d32a6c0512
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17 am: 4d48d8266d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: I2a53040c4a9a4afee0815c2791a2d381b3dfa993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:03:11 +00:00
Joshua Mccloskey
6f430f8e66
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I61bb8dcd5fb07d4493bfe6f140008e2567e923cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:37:36 +00:00
Joshua Mccloskey
62db0f71bc
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 02f0255b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I034b937a7e24f0af32f2f7371a0b0711dfa19bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:37:30 +00:00
Joshua Mccloskey
02f0255b7a
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I2424dc5d7377fd8f86f6d7d6c0dc14dfc274425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:29:29 +00:00