Commit Graph

101101 Commits

Author SHA1 Message Date
Joshua Mccloskey
75063d8474 Added vibration back to UDFPS#onEnrollmentProgress
Test: Verified haptic is now present.
Bug: 222593183
Change-Id: I3aed905e127f4e3eff931e4e35f5929389764b7e
2022-03-30 17:04:29 +00:00
Kevin Han
c4c923d1eb Merge "Update hibernation toggle title to have "if unused"" into tm-dev 2022-03-29 18:55:35 +00:00
TreeHugger Robot
1f881c6e86 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 17:54:31 +00:00
Treehugger Robot
997bdcf8f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918

Change-Id: If33b9f681a6b7b9fd3380ff95df68dda0a80513c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:48:01 +00:00
Bill Yi
cbb3ac7c9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045918

Change-Id: I080bbfcbed46db28ef9b31a72ce4236a9a625a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:47:59 +00:00
Treehugger Robot
cb0150bde0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919

Change-Id: I13faeea594a89e382f067a237440adf9183bd33a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:46:11 +00:00
Bill Yi
5729190b77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919

Change-Id: I1d32837fd68effe1470001964dd08c8a4463dfd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:46:07 +00:00
TreeHugger Robot
2e4f458627 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -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: I137bd8e32d90c1bb3691d53633fe9e86cf2562a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:38:58 +00:00
Bill Yi
f0886d920c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -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: I84bf0cdc0c3d2fef27883a04efc2944be2e6044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:38:56 +00:00
TreeHugger Robot
e5091256f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -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: I64ca7d3f6fc6d9e3668f0a08d3fd1f58f9a79d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 15:38:30 +00:00
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
Bill Yi
ac9baaee08 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8140f108bb0c0d00ba08b1fccab4b6fc9376d4dc
2022-03-29 03:00:30 +00:00
Grace Cheng
14ffe2a2ef Merge "Hide fingerprint setup animation from talkback users" into tm-dev 2022-03-28 23:47:06 +00:00
Kevin Han
3cfc87cc05 Update hibernation toggle title to have "if unused"
As per UX request, update the toggle title to say "Pause app activity if
unused" and remove "if unused" from the summary.

Bug: 227235454
Test: manual
Change-Id: I9c80f801fcd9bc29660705a7ea4dee0086739c81
2022-03-28 14:47:29 -07: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
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
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