TreeHugger Robot
09b761700d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-28 19:07:49 +00:00
Jack Yu
d01497a5de
Fix "learn more" link is not clickable
...
Use function setLearnMoreAction instead of ClickableSpan in
NFC FooterPreference.
Bug: 226299551
Test: maunal test
Change-Id: I69c494b3e6fc92940d498d8be0c9ef5041b1bb3b
2022-03-28 22:42:45 +08:00
Yi-Ling Chuang
0bf3ed99eb
Fix flickers on the Location page
...
Use the UiBlocker and its delegate method to prevent the flicker.
Fixes: 220837804
Test: Go to Settings > Location and see all items appearing at the same
time.
Change-Id: I2095289b9436ca66970b6a868d5c9780f2b19664
2022-03-28 17:27:34 +08: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
a493ed6f75
Merge "Use migrated severity levels" into tm-dev
2022-03-28 08:38: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
jasonwshsu
906805a591
Set title to the hearing aid pair instruction dialog
...
Bug: 225117843
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidDialogFragmentTest
Change-Id: Ia1f3dadba84e3302a87aba1274e77f31a74eea1b
2022-03-28 15:31:43 +08:00
Treehugger Robot
0818a1c62b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857
-s ours am: 178ba3e57d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: Id2d06b535518562830aeaed8b0f9f647e202ee68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:02:14 +00:00
Bill Yi
2b1435d300
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21
-s ours am: 5f55cb2ed8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: Ib485ceb1142d2e15bc2541fda0850a9cd02b40cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:02:13 +00:00
Treehugger Robot
c5142845f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276
-s ours am: 3ad321509f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I327ae4de3c8675c2da6a735ef6cadcf3310b6976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:01:19 +00:00
Bill Yi
e68d843167
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628
-s ours am: b28c27e68e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: Id571c60c7cf39d4f4327e67e692e1fe6ad73bae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 07:01:18 +00:00
TreeHugger Robot
0e536d93b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: Icd818627964fd287182375db9e2e91789a885c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:51:36 +00:00
Bill Yi
cc3a93e23b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289
Change-Id: I977992bbe1a5875e6827128bb3495afee8d71a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:51:34 +00:00
Treehugger Robot
178ba3e57d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I9969ee7d5bb026824736ebbba3c43c18f2343e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:45:52 +00:00
Bill Yi
5f55cb2ed8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918
Change-Id: I765e946f2e8e04370891f50fa42bcde6fe424c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:45:51 +00:00
TreeHugger Robot
2703c29227
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: I3a2febfb3742ac359a86226e0f1cc6a964ec8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:45:06 +00:00
Bill Yi
620782b9d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152
Change-Id: Iabad895ae533c8779bc8bc3f9330a520fae7f967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:44:52 +00:00
Treehugger Robot
3ad321509f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: Ie231da55ce887649cc28e0fec042b24b109d9379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:43:36 +00:00
Bill Yi
b28c27e68e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919
Change-Id: I031a74875cddf5b00bebfbf1d23b5afc9c1fe7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 06:43:25 +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
TreeHugger Robot
97539de67e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-03-28 06:27:30 +00:00
Treehugger Robot
d35c876857
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-03-28 06:24:36 +00:00
Treehugger Robot
65c7ff0276
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-03-28 06:23:23 +00:00
TreeHugger Robot
4d9878828e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-03-28 06:20:17 +00:00
Peter Wang
4f5dbc4db4
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400637
Change-Id: I9f9a7264dd55407f429898be56a08f7b3682eea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 05:32:04 +00:00
Peter Wang
0ab2226dff
Add a cancel string for ToggleSubscriptionDialog to handle Tamil
...
translation
Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
(cherry picked from commit 6879183335
)
2022-03-28 05:21:36 +00:00
Sarah Chin
61ec9b6d70
Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a
am: 9b9c5f2f93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029
Change-Id: Ic9802f7cfe88ea35afc0209fceb7666e6ee8b9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 05:17:02 +00:00
Sarah Chin
9b9c5f2f93
Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029
Change-Id: I66f96ad433720d92b3c8b0906c4fca1409d281ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 05:11:25 +00:00
Sarah Chin
1abef7542a
Merge "[MEP] Use switchToSub API with pending intent"
2022-03-28 04:58:54 +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
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
Weng Su
4c4a1f58c1
Restrict secondary users to share Wi-Fi network
...
- Remove "Share" and "Forget" options from the long press menu
- Add SafetyNet Logging for security report
Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
Merged-In: Ic434f0583cba557228c72508a501347ffa3141e1
2022-03-28 03:15:18 +08: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