Commit Graph

116179 Commits

Author SHA1 Message Date
Weng Su
673f06c2ec Show WiFi minimum level when the Wi-Fi level is UNREACHABLE
- Use WIFI_LEVEL_MIN instead of WIFI_LEVEL_UNREACHABLE to get the Wi-Fi icon resource to avoid app crashing because no valid Wi-Fi icon could be found.

Bug: 213294802
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ia805e902716c25db3276b96116a84d0dd2d96a1b
2022-09-26 20:54:19 +08:00
Bill Yi
b5273ac080 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-25 04:13:04 +00:00
Bill Yi
19edfdd6cb Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-25 04:13:04 +00:00
Treehugger Robot
eff730475e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e am: 5d95b855dc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I147a3065c4b214508b325c02e95da68ad22fec0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 10:57:12 +00:00
Treehugger Robot
5d95b855dc Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Ib32baeda6471ed9a8a2e5aa2cd84088505c1f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 10:26:46 +00:00
Treehugger Robot
984e74a32e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7 Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 09:27:24 +00:00
Treehugger Robot
61d8dee2a0 Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Ib4c2a39144bfe7870f39e5797cf42c75b9a49572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 08:54:52 +00:00
Treehugger Robot
4d5951c6ef Merge "Settings: Protect sensitive data on the about phone" 2022-09-24 08:23:53 +00:00
Bill Yi
65607e2870 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5717c61b030e6fd59c90eb32059ab1c9633b4639
2022-09-23 12:01:04 -07:00
Bill Yi
8ac2386e75 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96d30e86a9d27729037d579b1013e4ce814c3d55
2022-09-23 11:57:10 -07:00
Tom Hsu
f2a63608ba Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70 am: db0ec844f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: I399a80e1e609a14c2f6c821e8e3df36fa8983dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 17:12:22 +00:00
Bill Yi
0ebebf22f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b775443aa1 -s ours am: faa0e7298c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I212a243f97e83f2adf9287804724d1597e4209ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 16:57:56 +00:00
Bill Yi
b6e338ddc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddab089dab -s ours am: 627c3d311c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26c8becbed3932544290e9bca1dd9b2d65cd9c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 16:57:36 +00:00
Tom Hsu
db0ec844f2 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Idc4f0c59df19b6f0cc9a8a1db70ba546f12fafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 08:40:25 +00:00
Tom Hsu
1a4f16cd70 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 07:59:37 +00:00
Tom Hsu
7c813dced4 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Iacf9e213bb1f40859320957d7846803f4aeaa30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 07:32:19 +00:00
Tom Hsu
7e610abd3c Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Icd4cb165939b49e24ebbc83059c55914610e7eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 07:01:01 +00:00
Tom Hsu
8a9dc9ca90 Merge "[Settings] Update UI when bluetooth connection is down." 2022-09-23 06:39:35 +00:00
Bill Yi
faa0e7298c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b775443aa1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I503b6ebefbf71fe8b5f2d53f34a6e241d8d5f095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 04:23:03 +00:00
Bill Yi
627c3d311c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddab089dab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idbcfa8115e14211b8d05110362858f167ee01a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 04:22:44 +00:00
Bill Yi
b775443aa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-23 03:53:13 +00:00
Grace Cheng
f9b0a270db Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev am: afa2bb1ea5 am: 0676835aa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19994169

Change-Id: I2a1350fbcaf999657217eb9de4fd0bd2d1b888f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 21:43:15 +00:00
Bill Yi
ddab089dab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9bcf14095ff5043e49a327a29e3c48731336d78a
2022-09-22 14:14:21 -07:00
Grace Cheng
0676835aa0 Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev am: afa2bb1ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19994169

Change-Id: I0eb173743779ac3a88bbdfa56e77e610dc834131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 21:11:25 +00:00
TreeHugger Robot
2342c0feda Merge "Add phone, tablet, device fp deletion strings." 2022-09-22 20:44:30 +00:00
Grace Cheng
afa2bb1ea5 Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev 2022-09-22 20:28:33 +00:00
Grace Cheng
5951349839 [automerger skipped] Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972 am: 59f4b7bdc9 -s ours
am skip reason: Merged-In I26bea8e1870f08b413a4ec2a9e6e83015facd004 with SHA-1 415314113b is already in history

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

Change-Id: Iba2bf8d72028f0f33cefb829f537c61731e3701e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:41:19 +00:00
Grace Cheng
658652bf0b Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev am: 8669dc3697 am: 94f6a76ea1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19979253

Change-Id: I2e870d5f3105a49546a2e7777cb520f84cada5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:41:10 +00:00
Gil Cukierman
340c2c3fb4 Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6 am: ccfd44162f am: 02ef8722be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: Ife21ec23f145a7d4c52f2f6109cba514a9779370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:40:18 +00:00
Grace Cheng
59f4b7bdc9 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253

Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:38:19 +00:00
Grace Cheng
94f6a76ea1 Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev am: 8669dc3697
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19979253

Change-Id: I9d17ad0d79285590ae460146f056b59a0d46066b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:37:41 +00:00
Grace Cheng
a738eba09f Adds null-check on finger animation in enrollment
Adds a null-check before setting the finger animation during SFPS
enrollment

Test: Change display size to highest setting (sets mShouldShowLottie to
false), and verify that user can enroll finger successfully
Fixes: 247044864

Change-Id: I3d7f0bd3078e3a4516f656a8ee897387b0ca15c6
2022-09-22 17:54:27 +00:00
Gil Cukierman
02ef8722be Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6 am: ccfd44162f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I22634f05290d7c86c79e804b15a0db29d807911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 17:50:11 +00:00
Grace Cheng
108b73d972 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev 2022-09-22 17:37:13 +00:00
Grace Cheng
8669dc3697 Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev 2022-09-22 17:26:22 +00:00
Gil Cukierman
ccfd44162f Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf am: 1f750fcba6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 16:12:54 +00:00
Bill Yi
efb92b159f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65c5abe617 -s ours am: 4ee0f9853a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea0d77cb207776d0230bd43c090c797a572e263c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:49:45 +00:00
Bill Yi
168eee8d2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1b4909f3c -s ours am: 1315b49ed8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If20b43644523aef2976d998052ea483407916b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:49:34 +00:00
Bill Yi
6c9cede2aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c5b5a7326 -s ours am: 23f515945d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07293c561c9682962b936c3ed640bbe4f0a9aecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:49:15 +00:00
Bill Yi
2764b149e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82148a40ea -s ours am: 119210d456 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I624989fd9b587020c4243646cae82b68deeb195d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:48:59 +00:00
Bill Yi
4ee0f9853a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65c5abe617 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib71a13fda76003373003419c38365936facf1de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:31:35 +00:00
Bill Yi
1315b49ed8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1b4909f3c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5bf66796217c585bbc76674f0f865f7cc169d16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:31:16 +00:00
Bill Yi
23f515945d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c5b5a7326 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I896b5355f873b97256d021112dd74de1fd550899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:30:58 +00:00
Bill Yi
119210d456 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82148a40ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I184dedbce3f2588a9e15359ab6155403f42c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:30:43 +00:00
Gil Cukierman
1f750fcba6 Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a am: 24ac97a0bf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: I50305e27b205160d85825143f614cd52b1bab2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:23:54 +00:00
Gil Cukierman
24ac97a0bf Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: Ib46bd4f287a80582afb67f7ef052a3ff25862b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 14:30:53 +00:00
Bill Yi
65c5abe617 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-22 14:30:33 +00:00
Bill Yi
4c5b5a7326 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-22 14:30:33 +00:00
Gil Cukierman
594002e21a Merge "Use AAPT2 For SettingsUnitTests" 2022-09-22 13:40:19 +00:00