Bill Yi
46f045f411
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d
-s ours am: fbf554e66e
-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: I8cbaba18c3e0ecf45c81008d33726d239ee81ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:15:16 +00:00
TreeHugger Robot
7723c37234
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac
-s ours am: e5a507e23c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I73937e9aef737e9d10eb725abe15efbe552c93f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:15:12 +00:00
Bill Yi
85d2a6c7b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b
-s ours am: 04d01b2661
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ic36f1744655068cce7bf729f26b8cba914bf2639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:14:58 +00:00
Bill Yi
d9fbc3319c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75
-s ours am: 362f3f6b6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I054b90b7fde831108c85e053e8641ec6b3612561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:14:41 +00:00
TreeHugger Robot
e5a507e23c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I441cc35d147566377eb06f328905a44ea6649954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:05:07 +00:00
Bill Yi
04d01b2661
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I76566346fa6990130c77e736031ecbf4e40b2c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:55 +00:00
Bill Yi
362f3f6b6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: Ib0ff724718fbe1ab699152f1a6744015645d7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:36 +00:00
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
8122edc9ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-13 16:40:03 +00: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
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
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
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
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
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
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
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
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
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
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
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
Joshua Mccloskey
9f1af4fc86
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: Idb03b051753fa418e8ffb40d6f2fbc1a7d7db287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:29:07 +00:00
Joshua Mccloskey
06b76edbb7
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: I024b04ef4f87b923ff48d09fcf88036f7b51b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:27:59 +00:00
Joshua Mccloskey
52450aaa17
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev
2022-06-10 16:06:17 +00:00
Joshua Mccloskey
75313dcb5d
Merge "Updated FP enroll confirmation string" into tm-dev
2022-06-10 16:05:31 +00:00
TreeHugger Robot
579cdfb0a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: 999a23bee0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I322bfe17e2523248e6ed8b06bcba7aad7969c653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:45 +00:00
Bill Yi
ca3537a81e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 16761c0f92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I4e8a5a18aa22dd34b003f94d3bf3d88a2ec9792a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:40 +00:00
TreeHugger Robot
772ae4174e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 3b34105f01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I5db3c180784c87c4f00d7e7953fa81641196e3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:30 +00:00
Bill Yi
26d9456296
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: b807236c50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I27493619de76ff5485c6cc4bb5df96268987cc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:06:17 +00:00
TreeHugger Robot
3bf9830e4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I76ebc79be223327660477cdad86d556bef0b5e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:50 +00:00
Bill Yi
2ed856f004
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I864b6a2fd0ff2a3f9d46e44644f14c3d711ac3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:45 +00:00
TreeHugger Robot
706ca35aa8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I692572d6588be7cdf8c91cd7210487f011b60bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:35 +00:00
Bill Yi
f9494d6c97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: 5c0212eab6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: Ifcaca129cc3e85e3b392e136b4b0bce191d8d55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:03:22 +00:00
Bill Yi
b76ebc730e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 21559f3793
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: Iec2ab26807b75912f0e78599b41aa5b4b73a71cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 07:00:14 +00:00
Bill Yi
59fa253f8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 307f491327
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799018
Change-Id: I1e0bca83173ef8964c9941cc96918ede3a77b1c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:59:59 +00:00
Bill Yi
6b1fcc6bd5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5648098e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: I527f49613e557b6a664f75ddf5886ad1df33745e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:59:44 +00:00
Bill Yi
be7ddbcb78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d142ec9f58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18799017
Change-Id: Ia3eb84c3efa8f4539d98987431e0c306d142021d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 06:59:27 +00:00