Commit Graph

139554 Commits

Author SHA1 Message Date
Charlotte Lu
b13d63a30e [WIFI-WEP] Add WEP dialog in System UI.
Test: Visual Test
Fix: 328365908
Change-Id: Id4aca7ce4d014ff17ccde37e74d41cab920715cd
2024-04-12 05:50:15 +00:00
Chelsea Hao
96487471e7 Merge "Auto on string update." into main 2024-04-12 04:55:41 +00:00
Charlotte Lu
233c84f6da Merge "[WIFI-Enterprise] Change the summary for Certificate Details." into main 2024-04-12 04:40:30 +00:00
Chaohui Wang
823d18708a Merge "Move nfc_detection_point.png to res/drawable" into 24D1-dev am: e499724357
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26901180

Change-Id: Ic934242c6c07f0ff62525e0ab089e2d3009d6526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 03:26:29 +00:00
Chaohui Wang
e499724357 Merge "Move nfc_detection_point.png to res/drawable" into 24D1-dev 2024-04-12 03:10:48 +00:00
Becca Hughes
00edf33615 Merge "Make sure policy transparency is applied in all cases" into main 2024-04-11 20:41:50 +00:00
Joshua Mccloskey
d152502aae Merge "Updated FakeFingerprintManagerInteractor" into main 2024-04-11 20:15:23 +00:00
Treehugger Robot
f535575216 Merge "Restore enterprise policy checks" into 24D1-dev am: 1aea823b37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26923215

Change-Id: Idb2cd6f7a9af49d79202fa4379c6485da6b8d172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 18:58:18 +00:00
Treehugger Robot
1aea823b37 Merge "Restore enterprise policy checks" into 24D1-dev 2024-04-11 18:44:39 +00:00
Treehugger Robot
2c3433467c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 5ef10b2975 -s ours
am skip reason: contains skip directive

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

Change-Id: I9fd78b4a37b804f5febff71665ad90f5df7da8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:45:01 +00:00
Bill Yi
d2dbccdf88 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d2d9b9e3 -s ours
am skip reason: contains skip directive

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

Change-Id: I3375602fa5580d0dff97cab507a031db8a64f72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:44:54 +00:00
Treehugger Robot
8745f5d109 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 46d35a41d7 -s ours
am skip reason: contains skip directive

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

Change-Id: I8b4abd9eb983277308a064ae9dc450f891e0a84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:21 +00:00
Bill Yi
dfa70dd213 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 172b3d5664 -s ours
am skip reason: contains skip directive

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

Change-Id: I9b9a606361135111089b4937274160beb4fc6725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:18 +00:00
Treehugger Robot
59d4e7a404 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2e1f012b2b -s ours
am skip reason: contains skip directive

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

Change-Id: I76eab425ad64ac9ad4bcba7c82e14e2228017a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:15 +00:00
Bill Yi
41f0342e23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e049a82da8 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie3ca457ac371760b0ca812fe71e6a432e0e93d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:00 +00:00
Treehugger Robot
e5facc5403 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 7efcaf884a -s ours
am skip reason: contains skip directive

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

Change-Id: I1e0198626093b125f9303d1d6ef677d8466f218f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:42:55 +00:00
Bill Yi
a671047a28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 519a9badad -s ours
am skip reason: contains skip directive

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

Change-Id: Id0bc1f0290b2b30b6a9e0a24a6d67762280b9c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:42:42 +00:00
Bill Yi
0e974a992a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f855da2413 -s ours
am skip reason: contains skip directive

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

Change-Id: I6df16dc2a235481986744cb1f54630e3cc406b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:36:26 +00:00
Treehugger Robot
46d35a41d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot
2e1f012b2b Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot
7efcaf884a Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot
5ef10b2975 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-04-11 17:26:34 +00:00
Treehugger Robot
1bcf9658bb Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-11 17:25:37 +00:00
Treehugger Robot
95f507599e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-11 17:25:37 +00:00
Treehugger Robot
dee72e61aa Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-11 17:25:37 +00:00
Bill Lin
61984ba410 Merge "Revert "Apply "@style/GlifTheme.Light" for Fingerprint enroll activities"" into main 2024-04-11 16:43:44 +00:00
Becca Hughes
2fc40e8be7 Make sure policy transparency is applied in all cases
There are some cases where policy transparency is not
correctly showing up (e.g. on the main setting screen
for the primary provider). This makes sure policy
transparency is fully applied to the end user.

Test: manual on device
Bug: 333597574
Change-Id: I8d6a4c60e40bd2e639127777efdb04f1035c24bc
2024-04-11 16:18:54 +00:00
Randy Pfohl
e3a1699740 Merge "Updating nav tutorial button content description" into main 2024-04-11 15:37:16 +00:00
pajacechen
93599816d0 Fix filed test case in BatteryInfoTest
Root cause: the test case has timezone dependency, it need to set
timezone before run the test case or it will be failed on different
timezone.
Solution: Replace AlarmManager.setTimeZone with TimeZone.setDefault,
AlarmManager.setTimeZone() seems failed to change timezone for test case.

Fix: 333857349
Test: http://ab/I51500010265016400
Change-Id: Id36dd10866720cba19cce471d294e09272c8091f
2024-04-11 21:57:20 +08:00
Neil Fuller
a39c14c08e Restore enterprise policy checks
Restore enterprise policy checks removed by commit
fdab44f9e7 and not since restored by other
changes.

Bug: 325886855
Bug: 316584466
Bug: 235445309
Test: Treehugger only
Change-Id: Id3d79805bb2289b84ad34ac05a97e50f0410502f
(cherry picked from commit 5d80553a15)
2024-04-11 12:48:51 +00:00
Treehugger Robot
4812ce3732 Merge "Don't log anomaly event_id because it is not a repeated string." into main 2024-04-11 12:06:08 +00:00
Charlotte Lu
eab9765e52 [WIFI-Enterprise] Change the summary for Certificate Details.
Test: Visual Test
Fix: 333850992
Change-Id: If2d8743f788a0732267ac6576f77bea41b4e2e84
2024-04-11 11:40:30 +00:00
Neil Fuller
c365d864a5 Merge "Restore enterprise policy checks" into main 2024-04-11 10:45:46 +00:00
Pajace Chen
c55cd9526e Merge "Add charging string V2 for settings" into main 2024-04-11 10:38:40 +00:00
Weng Su
a66a4a0d41 Merge "Checks WEP password lengths of Wi-Fi network" into main 2024-04-11 10:07:11 +00:00
Zaiyue Xue
d1b3691f6a Merge "Update the usage slot info in database" into main 2024-04-11 10:05:10 +00:00
Zaiyue Xue
71adec6dd5 Don't log anomaly event_id because it is not a repeated string.
Bug: 316075226
Test: presubmit
Change-Id: Id0b598b5cbdee15ae11ecf3d8d0dc7b7c67e9f3f
2024-04-11 17:50:54 +08:00
Charlotte Lu
d4c63883ce Merge "[WIFI-WEP] Change the strings for WEP." into main 2024-04-11 09:21:14 +00:00
Vincent Wang
7c33a5ceae Merge "Update string for acquire msg FINGERPRINT_ACQUIRED_IMAGER_DIRTY on UDFPS devices" into main 2024-04-11 08:55:07 +00:00
mxyyiyi
749a642be6 Update the usage slot info in database
- For personal/work profile, always send data to db
- For private profile, skip load data in period job

Bug: 331720433
Bug: 324191159
Test: manual
Change-Id: I77526dfdc837a6edaa9184bf3c751a7455b839a8
2024-04-11 16:54:36 +08:00
Fan Wu
f83b076d66 Merge "Remove LooperMode.LEGACY from settings/password" into main 2024-04-11 08:43:56 +00:00
Weng Su
1cd3b6f21f Checks WEP password lengths of Wi-Fi network
- Checks for WEP40 and WEP104 password lengths (5 and 13 bytes)

Bug: 333289235
Flag: None
Test: unit test
atest -c WifiConfigController2Test

Change-Id: I5f96ad67ed0c67a2724960e72464dc0a56c0c1ab
2024-04-11 08:20:17 +00:00
Bill Lin
fce30a15f5 Revert "Apply "@style/GlifTheme.Light" for Fingerprint enroll activities"
This reverts commit cba2df43cb.

Reason for revert: 333815129

Change-Id: I83c16179565d189c43bab2f8bdcc25b3b3f1c980
2024-04-11 08:12:12 +00:00
Samuel Huang
ba03a22317 Avoid SIM card on/off dialog pop-up if satellite is enabled am: f2ed0ec752
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26847152

Change-Id: Ifb4f85972f29370d51a8c6363fa8efd63e6dead5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 07:36:48 +00:00
Charlotte Lu
f4adddd29d [WIFI-WEP] Change the strings for WEP.
Test: Visual Test
Fix: 303787048
Change-Id: I674944aee08b8bd3a9185d38b2c76b4ad16061f1
2024-04-11 07:29:11 +00:00
Edgar Wang
214eb72776 Merge "Avoid NullPointerException when AppPicker onCreated called." into main 2024-04-11 07:25:58 +00:00
Fan Wu
b941ff7b11 Remove LooperMode.LEGACY from settings/password
Bug: 333831275

Test: atest
Change-Id: I34df868ceebf86d320ee5ff8de7657fbb221b9fc
2024-04-11 06:52:22 +00:00
Samuel Huang
f2ed0ec752 Avoid SIM card on/off dialog pop-up if satellite is enabled
In order to support Satellite SOS, device will have two modems, one for TN, one for NTN(satellite).

When device switches to satellite mode, PSS only disables TN eSIM (and not TN PSIM). Since NTN image only supports eSIM, there is no need to disable TN PSIM before switching to NTN image. Somehow device is seeing that TN PSIM is available and is showing the user to enable it. So we need to handle it by not showing this dialog during satellite mode enabled.

Bug: 330585109
Test: atest, manual
Change-Id: I9781b7e1cef8f7f10e7ecdbb23ca729da4d06eba
2024-04-11 05:20:53 +00:00
Fan Wu
860bd52451 Merge "Remove LooperMode.LEGACY usage from settings/notification" into main 2024-04-11 04:29:57 +00:00
Bill Yi
172b3d5664 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8fca1324f16465e3eac933506b9c60316a037093
2024-04-10 20:37:04 -07:00