Bonian Chen
c676cbcaf3
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev am: 3df6924591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286345
Change-Id: Id614300db4c1c1555bd963c0281b7ebb82b4a153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 05:06:22 +00:00
Bonian Chen
3df6924591
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev
2022-03-29 04:50:20 +00:00
Grace Cheng
a9318375ea
Merge "Hide fingerprint setup animation from talkback users" into tm-dev am: 14ffe2a2ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126
Change-Id: Ia3f04dd73d8cc96ee51a492a756d020ce0761a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 00:06:24 +00:00
Grace Cheng
14ffe2a2ef
Merge "Hide fingerprint setup animation from talkback users" into tm-dev
2022-03-28 23:47:06 +00:00
Grace Cheng
d17e49853f
Merge changes from topic "presubmit-am-329e8f4e07b8433d90ca6850e1be95f1" into tm-mainline-prod
...
* changes:
[automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2
Hide fingerprint setup animation from talkback users
2022-03-28 23:47:06 +00:00
TreeHugger Robot
4a926629e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09b761700d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178
Change-Id: I72344a0005c60e1eb94b7e9c572d96c1ef0602dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 19:32:07 +00:00
TreeHugger Robot
09b761700d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-28 19:07:49 +00:00
TreeHugger Robot
8cf398f54c
Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68" into tm-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab
Import translations. DO NOT MERGE ANYWHERE
2022-03-28 19:07:49 +00:00
TreeHugger Robot
daef9fa397
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-03-28 18:56:52 +00:00
TreeHugger Robot
23c2c3da41
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177
Change-Id: I19e0a83052b44b6a0c09acaac2dc714477846995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:59:40 +00:00
Giulio Fiscella
918ae23a07
Merge "Use migrated severity levels" into tm-dev am: a493ed6f75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Change-Id: Idf5621c4b257ef7f823e4dc072ca7e416d53ff5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:59:33 +00:00
TreeHugger Robot
5fd1f8fe4e
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev
2022-03-28 08:43:23 +00:00
Giulio Fiscella
7aa25402d2
Merge changes from topic "scAPItm" into tm-mainline-prod
...
* changes:
[automerge] Use migrated severity levels 2p: 2a775c69fc
Use migrated severity levels
2022-03-28 08:38:47 +00:00
Giulio Fiscella
a493ed6f75
Merge "Use migrated severity levels" into tm-dev
2022-03-28 08:38:47 +00:00
TreeHugger Robot
367cfd4fc3
Merge "Rename the wording for "Wallpaper" under About" into tm-dev am: 32ac672ea5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884
Change-Id: Ib778211b70d66ef936a03f4c83cd5fba66fa7156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:33:47 +00:00
TreeHugger Robot
32ac672ea5
Merge "Rename the wording for "Wallpaper" under About" into tm-dev
2022-03-28 08:07:03 +00:00
TreeHugger Robot
5eef5f7c0e
Merge changes from topic "presubmit-am-4ee42228d6fc407e80556e83c7adc073" into tm-mainline-prod
...
* changes:
[automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2
Rename the wording for "Wallpaper" under About
2022-03-28 08:07:03 +00:00
Menghan Li
988ff40ec2
Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586
Change-Id: Id7492a2d81b64929ae6b1ec4d1ea4f8135212b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:06:38 +00:00
Menghan Li
c122879474
Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev
2022-03-28 06:43:20 +00:00
menghanli
917ab11ed1
Fix Caption preview SubtitleView textSize cannot update correctly
...
Root caue: When received #OnLayoutChangeListener callback, the mPainText size keeps "zero" after called setTextSize() because the requestLayout() does not trigger the whole view re-measure & re-layout in not ui thread.
Solution: Post #refreshPreviewText to ui thread to get correct bounds to
measure & layout.
Bug: 223696269
Bug: 211178478
Test: Manually test
Change-Id: Idcbeba52876171e5f3641eafc77d203764c78788
2022-03-28 12:30:29 +08:00
Tsung-Mao Fang
0427d13d07
[automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884
Change-Id: Ia41ecd508fe1ec6bfb3cc0fa215664e94b2477fc
2022-03-28 02:51:43 +00:00
Tsung-Mao Fang
4b27f24ab2
Rename the wording for "Wallpaper" under About
...
In order to improve the order in the search result
between "Wallpapers attributions" and "Wallpaper & style",
We should rename the wording here, and I think "Wallpaper"
is confused under About page.
Test: See the order in the search result list.
Fix: 201359802
Change-Id: I2b50703a7e4bbffd0649a60f7bc2c463f6877fba
2022-03-28 02:51:33 +00:00
SongFerng Wang
bb374dc257
[automerger skipped] Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7
am: b9cd3f7ef9
am: 53f68b7f27
-s ours am: 3beb209f1f
-s ours
...
am skip reason: Merged-In Iee650897b81c96b5febb0413649629b1a1971b18 with SHA-1 bf148dea7c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028
Change-Id: Ief56f5117943433ef098d7d94b7b102d165255be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:54:40 +00:00
SongFerngWang
9c5332be3d
[automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d26696b
am: 04424bbf69
am: 2eb57839c6
-s ours am: 1b62ca1267
-s ours
...
am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49f3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027
Change-Id: I45e9ababae56f79c5ab12e744e51e70a1aa3364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:54:38 +00:00
SongFerngWang
9e202e028e
[automerger skipped] [MEP] renew the default data selection UI am: db2ddb6a92
am: e9d39b468d
am: 696f538ff3
-s ours am: e6d9e910d9
-s ours
...
am skip reason: Merged-In I5c6ad4b35d38112d5e88330a3fc9638be533bc94 with SHA-1 be8f279f2c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026
Change-Id: I13c809c86c5c724e9157f86f492aac8bc0c43da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:54:37 +00:00
SongFerngWang
695fef0c00
[automerger skipped] switch SIM refactor to support MEP am: 59a6ecbde2
am: b29d670c71
am: 0453d9de8d
-s ours am: a579616596
-s ours
...
am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b420
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025
Change-Id: I33345358d241c3f928c2acad799e74c8a7355532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:54:36 +00:00
SongFerngWang
16274d2eaf
[automerger skipped] switch SIM refactor to support MEP am: 37358798bc
am: 483ff27a47
am: 57fbdab22d
-s ours am: 7ae4b284b0
-s ours
...
am skip reason: Merged-In I8580022793e5c3fc14159f14b406f864353477f8 with SHA-1 1e0e9021ac
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024
Change-Id: I29e24837dcafa6027bae17905ad0392e89ffbecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:54:35 +00:00
changbetty
ce1ba949c4
[automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45
am: 342fe3487e
am: 4b3a17619e
-s ours am: 606c1b0aaa
-s ours
...
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023
Change-Id: I8e3d2800a8d361ea84fdb332675dde6d083361df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:54:34 +00:00
SongFerng Wang
3beb209f1f
[automerger skipped] Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7
am: b9cd3f7ef9
am: 53f68b7f27
-s ours
...
am skip reason: Merged-In Iee650897b81c96b5febb0413649629b1a1971b18 with SHA-1 bf148dea7c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028
Change-Id: I5e4002fcfebbaec866281a1f7f9e1350835e0fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:39:48 +00:00
SongFerngWang
1b62ca1267
[automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d26696b
am: 04424bbf69
am: 2eb57839c6
-s ours
...
am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49f3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027
Change-Id: I2b27b25c369eac1630473ed8453685a6aa211349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:39:46 +00:00
SongFerngWang
e6d9e910d9
[automerger skipped] [MEP] renew the default data selection UI am: db2ddb6a92
am: e9d39b468d
am: 696f538ff3
-s ours
...
am skip reason: Merged-In I5c6ad4b35d38112d5e88330a3fc9638be533bc94 with SHA-1 be8f279f2c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026
Change-Id: I8e1b4fc8b6de1410a9bf53b4e6267c17b93f1bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:39:44 +00:00
SongFerngWang
a579616596
[automerger skipped] switch SIM refactor to support MEP am: 59a6ecbde2
am: b29d670c71
am: 0453d9de8d
-s ours
...
am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b420
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025
Change-Id: Ia7af3453b0573d808f31bcfb022b6de36bbce8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:39:42 +00:00
SongFerngWang
7ae4b284b0
[automerger skipped] switch SIM refactor to support MEP am: 37358798bc
am: 483ff27a47
am: 57fbdab22d
-s ours
...
am skip reason: Merged-In I8580022793e5c3fc14159f14b406f864353477f8 with SHA-1 1e0e9021ac
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024
Change-Id: I9b0f34bd7dcbaabee0378a3605c6812e2b1872fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:39:41 +00:00
changbetty
606c1b0aaa
[automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45
am: 342fe3487e
am: 4b3a17619e
-s ours
...
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023
Change-Id: I4d165b0b13b55959be708904cf08d134f76c77cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:39:38 +00:00
SongFerng Wang
53f68b7f27
Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7
am: b9cd3f7ef9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028
Change-Id: Ie9741186e04bab03be7339f94a789675d12c6360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:38 +00:00
SongFerngWang
2eb57839c6
[MEP] renew the sim confirm dialog UI am: ba9d26696b
am: 04424bbf69
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027
Change-Id: I3b3b17af236799939a4919c67f123005740e1aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:37 +00:00
SongFerngWang
696f538ff3
[MEP] renew the default data selection UI am: db2ddb6a92
am: e9d39b468d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026
Change-Id: I0b55a215eaa751232ffe69c7cfc16cf713e3d390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:35 +00:00
SongFerngWang
0453d9de8d
switch SIM refactor to support MEP am: 59a6ecbde2
am: b29d670c71
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025
Change-Id: I7592c07952c05765a409b92845379e325697b521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:34 +00:00
SongFerngWang
57fbdab22d
switch SIM refactor to support MEP am: 37358798bc
am: 483ff27a47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024
Change-Id: I6e35330168e2094e5bb7b9cbcf80574fcfe38773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:33 +00:00
changbetty
4b3a17619e
Support RTL mode in Sim switch dialog am: 562cc5ed45
am: 342fe3487e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023
Change-Id: I2c4120d86f9c27bad0f57df881eddbb97ba9c4fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:26:32 +00:00
SongFerng Wang
b9cd3f7ef9
Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043028
Change-Id: I473db94863284e07184f90f6f442d3d405c87e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:46 +00:00
SongFerngWang
04424bbf69
[MEP] renew the sim confirm dialog UI am: ba9d26696b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043027
Change-Id: I8a21b5f42cdd0febc75d2b4fca211bb21d8ea084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:45 +00:00
SongFerngWang
e9d39b468d
[MEP] renew the default data selection UI am: db2ddb6a92
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043026
Change-Id: I8854b721cc74a33071abaa2ff76a8e3428174c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:44 +00:00
SongFerngWang
b29d670c71
switch SIM refactor to support MEP am: 59a6ecbde2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043025
Change-Id: I5747bf7dec160d081f4cb2c69f60173c9d4dd6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:42 +00:00
SongFerngWang
483ff27a47
switch SIM refactor to support MEP am: 37358798bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043024
Change-Id: I9ede4062566e48899eb79ff12e5e4cd96b01ddba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:41 +00:00
changbetty
342fe3487e
Support RTL mode in Sim switch dialog am: 562cc5ed45
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043023
Change-Id: I67e4a9aa874b0a103c5c06863d42826f8f0a3a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 15:05:40 +00:00
SongFerng Wang
31c40b00e7
Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ...
...
* changes:
[MEP] disable enabled esim profile before set simSlotMapping
[MEP] renew the sim confirm dialog UI
[MEP] renew the default data selection UI
switch SIM refactor to support MEP
switch SIM refactor to support MEP
Support RTL mode in Sim switch dialog
2022-03-27 14:44:48 +00:00
Peter Wang
06fb46cb26
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 6879183335
-s ours am: 15b28eb1cf
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 ee1893af6e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400624
Change-Id: I54d767eb80a0f219f918de687a2231e9545f7347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 14:00:51 +00:00
Peter Wang
15b28eb1cf
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 6879183335
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 ee1893af6e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400624
Change-Id: I71bf1df18176933cad1e816722cddc1051d11822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-27 13:45:39 +00:00
Peter Wang
6879183335
Add a cancel string for ToggleSubscriptionDialog to handle Tamil
...
translation
Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
2022-03-26 15:12:14 +08:00