PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
140,019 Commits 1 Branch 0 Tags
4d725d77151f1891f2af9f7d88e64b082fff075c
Commit Graph

140019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
songferngwang
e09f077e25 Fix the settings crash am: 428aaacefa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26930398

Change-Id: Ibe1d3c73afac7439a6a4b4a87039a5e623543ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-12 07:11:17 +00:00
Charlotte Lu
0dd832ec8f Merge "[WIFI-Enterprise] Add Server name field." into main 2024-04-12 06:40:23 +00:00
Pajace Chen
d9b44a8b9c Add charging string V2 for settings 
Apply charging string V2 for settings

Bug: 328546483
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f3c97f60a966a8ec357ba4d15b19d9d7a04b34d)
Merged-In: Ic68bf4231da81d865faa285bca97a929abe26a42
Change-Id: Ic68bf4231da81d865faa285bca97a929abe26a42
 2024-04-12 06:23:55 +00:00
Treehugger Robot
3ac7abe2dd Merge "Fix failed test case in BatteryInfoTest" into main 2024-04-12 06:21:50 +00:00
songferngwang
428aaacefa Fix the settings crash 
When the user select mobile network settings item with subid=-1 in
the search list, then some of objects are not initialized.

Bug: 325956182
Test: atest AutoSelectPreferenceControllerTest
atest MobileNetworkPhoneNumberPreferenceControllerTest
atest MobileNetworkSpnPreferenceControllerTest
atest MobileNetworkImeiPreferenceControllerTest
atest WifiCallingPreferenceControllerTest

Change-Id: I17c24b6f542392f018c65b689862f9735fad4b9f
(cherry picked from commit e0b5de28ae)
 2024-04-12 06:07:21 +00:00
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
Pajace Chen
afdf231921 Fix failed test case in BatteryInfoTest 
Test:  http://ab/I66000010265031461
Bug: 333857349
Change-Id: I213b4cab305a1484684f2f85294d71531bb8a048
 2024-04-12 05:19:18 +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
Charlotte Lu
0a87a1685e [WIFI-Enterprise] Add Server name field. 
Test: Unit Test
Fix: 333855426
Change-Id: Idfcb5f4efd36257188b04e2be7c7dc1127681b06
 2024-04-12 12:39:55 +08:00
Hyunho
477b291b5d When the transfer status is CONVERTED, the menu on the pSIM is greyed out. 
UX update for converted pSIMs.

Bug: 326896614
Test: manual test

Change-Id: I68ca181ec16c839ed8dc5dba3f8dc75aba09ab5b
 2024-04-12 03:29:35 +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
Manish Singh
cace44f497 Fix location services for all profiles 
Bug: 330538899
Bug: 333507072
Test: atest LocationInjectedServicesPreferenceControllerTest
Test: manual
Change-Id: Ia42e59b73b9b7c84ecb89082e968b801e1fd1302
 2024-04-11 16:11:41 +00:00
josephpv
a7603d2b43 Handle startProfile failure during creation of private space 
This includes to verify return value of startProfile to check if profile
is started successfully. If startProfile failed for any reason then
delete the created profile and return false for createPrivateProfile().

Bug: 313926659
Test: atest PrivateSpaceMaintainerTest
Change-Id: I493cb3a41cef8bdc1be42fe328c4f7bd04944b94
 2024-04-11 15:59:43 +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