Bill Yi
78bfe2c604
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841
-s ours am: 620782b9d4
-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: I2bae1da3c62063d6ae7544cb863a8d34952252fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:38:28 +00:00
Peter Wang
886b22a7a6
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff
-s ours am: 4f5dbc4db4
-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: I3555813a6c257b9a084febc50b50ebd0936df3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 15:09:30 +00:00
Sarah Chin
a8312161c7
[automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a
am: 9b9c5f2f93
am: 61ec9b6d70
-s ours
...
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029
Change-Id: Ic6ca95a4fb388ef93b63135e7064932406eec83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 14:22:52 +00:00
Chaohui Wang
b94c0ab44e
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev
2022-03-29 10:36:31 +00:00
TreeHugger Robot
670016a2ee
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev
2022-03-29 06:33:46 +00:00
Bonian Chen
3df6924591
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev
2022-03-29 04:50:20 +00:00
Chaohui Wang
9d8603568d
Fix "Automatically sync app data" button state not changed
...
This issue is caused by mPreference is null.
(Not recovered when the fragment is recreated after configuration change.)
Mimic the PreferenceDialogFragmentCompat.getPreference() in AndroidX to
solve this issue.
https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java;l=176;drc=ca9feb3b73769089afbfd36b4d4a3d91239f9cd5
Ideally in the long term, we could use PreferenceDialogFragmentCompat
instead.
Fix: 218754949
Test: robotest & manual
Change-Id: I7fc8dd3b771aa45c91f915e25c8cc6c6afdd8d63
2022-03-29 12:32:23 +08:00
Grace Cheng
14ffe2a2ef
Merge "Hide fingerprint setup animation from talkback users" into tm-dev
2022-03-28 23:47:06 +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
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
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
Menghan Li
c122879474
Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev
2022-03-28 06:43:20 +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
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
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
Bill Yi
9e58dde841
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iace08c34ff96cd8eca6a9fdb99be5a3cc61bde27
2022-03-27 00:00:55 +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
Bill Yi
9d49da2eab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42fdaf7064635675a25608949766ef25348f6f6e
2022-03-26 00:13:52 +00:00
Joe Bolinger
6f94d1f784
Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp am: 8ff1ef339f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17386185
Change-Id: I753ad8af595172167eb8b34dd73a58e95d65d1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:39:18 +00:00
Joe Bolinger
8ff1ef339f
Merge changes from topic "presubmit-am-7558807516104e4aa3755256c45095b4" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Set exported flag to false. 2p: 34704f4108
Set exported flag to false.
2022-03-25 22:20:22 +00:00
Grace Cheng
404ed2b0b2
Hide fingerprint setup animation from talkback users
...
Hides fingerprint setup animation from talkback users to prevent
unlabelled talkback
Fixes: 215461655
Test: Manually navigate to fingerprint setup page, swipe to confirm
animation is not focusable or spoken by talkback
Change-Id: I610ae68ed75d6b9f92005b0e12473b9c5dc6815b
2022-03-25 21:52:40 +00:00
SongFerng Wang
a32f1f6efa
[automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb
-s ours am: 8030d66e0d
-s ours am: b88a4a8830
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033
Change-Id: I264f63c88d5cec442774ddfe7f87a28c3d281259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:49:24 +00:00
Peter Wang
5695d6492e
[automerger skipped] Add a cancel string for the dialog to handle Tamil translation am: aa042c2d6c
-s ours am: 810677e214
-s ours am: 16f75f0c64
-s ours
...
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033
Change-Id: Ia51eb28953b2423993caf2fa4c0753ef2bb5bd51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:49:23 +00:00
SongFerng Wang
86ab18c4d8
[automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9
-s ours am: 5dea8d562f
-s ours am: 83a12cf22c
-s ours
...
am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043032
Change-Id: Idc449211d34212210751196365efb25b23b514fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 17:49:04 +00:00