Commit Graph

118690 Commits

Author SHA1 Message Date
Bill Yi
cba2a45d21 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2626acac3d
Blank merge reason: commit message contains skip directive

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

Change-Id: I6bdcf7067793af562843f6b8632eca5a16957850
2022-12-08 22:10:02 +00:00
Zaiyue Xue
5474c1849b [Battery usage U] For system comsumed power, use device comsumed power directly instead of removing app comsumed power from it.
Bug: 261826748
Fix: 261826748
Test: manual
Change-Id: Iab6eed4339fabe342835a020cadae11e6256be20
2022-12-08 19:03:27 +08:00
Zoey Chen
f172189e8e [Settings] eSIM transfer: MobileNetworkSummaryController
1. MobileNetworkSummaryController

 - No matter single SIM or multiple SIMs, always launch MobileNetworkListFragment
 - Remove the + and |

APM off: https://screenshot.googleplex.com/7M8qzsXFesy3nDi.png
APM on: https://screenshot.googleplex.com/C4ZnbpgUTPzTijL.png

2. Fix the APM mode

Bug: 244786012
Bug: 261810065
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest
Change-Id: I8e5c9b8a58ef13b6deaea284e9793077b2da58f6
2022-12-08 10:29:08 +00:00
Zaiyue Xue
131958c8bc [Battery usage U] Calculate each item pertage for App tab and System tab separately.
Bug: 261820602
Fix: 261820602
Test: manual
Change-Id: Iaab63bd5c6459486645987524d61b69dfca20fd6
2022-12-08 18:07:47 +08:00
Bill Yi
afd2a8e009 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibb23f9583f98c120733cc0ba1ca621d39855d960
2022-12-08 01:19:59 -08:00
Bill Yi
2626acac3d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iade325b06bc425f65775d3f7ba406df31d63d818
2022-12-08 01:10:38 -08:00
xuelin
688e61a4c6 fix WifiUtils:isNetworkLockedDown() null pointer issue
In the WifiUtils class, the isNetworkLockedDown() method does not
determine whether the context is empty, which will cause a null
pointer exception. This change adds a condition for judging the
input context as empty.

Bug:261812909
Test:make RunSettingsRoboTests
Change-Id: Ie0f17179c25a7e9d4b2f652a5667eef3cc577c7b
Signed-off-by: xuelin <xuelin@xiaomi.corp-partner.google.com>
2022-12-08 16:02:31 +08:00
Bonian Chen
09b0edbdee [Settings] Code refactor
1. Adjust test case for improving testing performance
2. Some code refactor for avoiding from NullPointerException

Bug: 260540995
Test: auto and local
Change-Id: I18bd474304194137166c3c03ff828abdcd58473e
2022-12-08 07:17:13 +00:00
Bonian Chen
f19e92cc2c [Settings] Code refactor for device without SIM
Code refactor to hide some UI entries, since there's a BluetoothWiFiPreferenceController
covers some of the work for device without SIM.

Bug: 259611847
Test: local & auto
Change-Id: Ia221663e180c8dabed2a25a927643c992ef8ac89
2022-12-08 05:24:01 +00:00
Zhenwei Chen
b04d06a470 [automerger skipped] Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec149 am: a08c9db9f2 -s ours
am skip reason: Merged-In I084c9cd52a408efa3b9aeee96a0af0cae481ec79 with SHA-1 52323128dc is already in history

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

Change-Id: Id63c2d0186818f460deefad81c3e4b0d91b3febd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 04:14:07 +00:00
Zhenwei Chen
a08c9db9f2 Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec149
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640198

Change-Id: Ia70a664a5fecab8090739fb632987965d7eb1161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 03:48:16 +00:00
Zhenwei Chen
72490ec149 Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev 2022-12-08 03:33:57 +00:00
TreeHugger Robot
2825910515 Merge "Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced." 2022-12-08 02:18:15 +00:00
Bonian Chen
ccf119a283 Merge "[Settings] BT and WiFi reset menu might covers VPN" 2022-12-08 00:50:08 +00:00
Weng Su
c4d0597373 Check multiple security types for Wi-Fi NetworkRequest
- The WifiEntry already support multiple security types simultaneously from framework

- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods

- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
  - WifiEntry:      getSecurity:WPA2   // getSecurityTypes:{WPA2, WPA3}
  - ReqeustNetwork: getSecurity:WPA3

- Need to use getSecurityTypes to check for matching WifiEntry

Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Merged-In: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
(cherry picked from commit a88c064842)
2022-12-07 18:15:44 +00:00
Yasin Kilicdere
ee476cab18 Remove the fallback AddSupervisedUserActivity.
Rollback the changes done in ag/16388725 and ag/16709333

Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"

Change-Id: I75b85df50a3caff55375ad261a97225377644a38
(cherry picked from commit 86f3500439)
Fixes: 249057848
2022-12-07 15:23:37 +00:00
TreeHugger Robot
642a0a74a4 Merge "Check multiple security types for Wi-Fi NetworkRequest" 2022-12-07 14:25:58 +00:00
Jason Hsu
631427bb08 Merge "[Audio routing] Add strings for audio routing page for Android U" 2022-12-07 14:23:33 +00:00
Jason Hsu
478b6f3d89 Merge "[Hearing devices page] Add strings for hearing devices page for Android U" 2022-12-07 14:23:00 +00:00
João Victor Mendes Freire
16a10ba0a1 Merge "Fix user avatar not being set on rotation" 2022-12-07 13:49:32 +00:00
João Victor Mendes Freire
d97f27b816 Merge "Fix user not being redirect to user details page" 2022-12-07 13:49:21 +00:00
João Victor Mendes Freire
6754d52673 Merge "Fix settings crash on users page on config change" 2022-12-07 13:49:08 +00:00
Bonian Chen
7b06d5f0e1 [Settings] BT and WiFi reset menu might covers VPN
VPN would be reset by BT and WiFi reset menu under device without a SIM
available.

Bug: 260034791
Test: local and auto
Change-Id: I3c66cd629977cc11172758ebbe314167b5220419
2022-12-07 13:45:51 +00:00
Zaiyue Xue
4b14c49dfb Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced.
Bug: 256123455
Test: presubmit
Change-Id: Ia22eb8d11836b9b0d8ab74f4760e81966040a947
2022-12-07 20:47:44 +08:00
Rupesh Bansal
bc255db77a Remove VR features from apps
Bug: 260555143
Test: atest com.android.server.power
Change-Id: I7d1938363dacb06f93cea69672a710ccbb76012e
2022-12-07 12:30:30 +00:00
Weng Su
a88c064842 Check multiple security types for Wi-Fi NetworkRequest
- The WifiEntry already support multiple security types simultaneously from framework

- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods

- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
  - WifiEntry:      getSecurity:WPA2   // getSecurityTypes:{WPA2, WPA3}
  - ReqeustNetwork: getSecurity:WPA3

- Need to use getSecurityTypes to check for matching WifiEntry

Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
2022-12-07 20:09:28 +08:00
TreeHugger Robot
f17d3c4697 Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed" 2022-12-07 11:47:43 +00:00
TreeHugger Robot
2e8dc1c49f Merge "Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()" 2022-12-07 11:24:15 +00:00
Bonian Chen
d73c751f3d Merge "[Settings] Code refactor for performance" 2022-12-07 10:25:49 +00:00
Zoey Chen
a8f0151a1b [automerger skipped] Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 am: 8b0070a509 am: 45c646d6cb -s ours
am skip reason: Merged-In I07bf9a8f59ea14fc8133e2473746a59a5c187d47 with SHA-1 3eaadf598f is already in history

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

Change-Id: If2c47c775d58c40c23655e50020ec0c258052038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 10:17:20 +00:00
Zhenwei Chen
6e73954181 [automerger skipped] Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358 am: 89ad53e3cb -s ours
am skip reason: Merged-In I8f94f984dc1bf833653ae49557fdd02f736b365c with SHA-1 54615b3bec is already in history

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

Change-Id: Ia90bd98be91c7471af6efee7a9d6d4f36de4e08d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 10:16:35 +00:00
Zoey Chen
45c646d6cb Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 am: 8b0070a509
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Iffed6efb8542259ae3f1ca22c198cc768a4ad126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 10:13:35 +00:00
TreeHugger Robot
8dd0992634 Merge "Add back resources exported for external usage 2" 2022-12-07 09:44:50 +00:00
Zoey Chen
8b0070a509 Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Ic4f9bb2f9fb07e9243dbb327f2ce0a41eeb9da0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 09:29:48 +00:00
Zhenwei Chen
89ad53e3cb Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20638347

Change-Id: I8d1993dea1435d4f6679e682be99025a9a0daa30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 09:29:07 +00:00
Zaiyue Xue
76f19809c1 Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()
Bug: 261390301
Fix: 261390301
Test: manual
Change-Id: I23a2f0e73c5840b87577e734a4760423e0d62516
2022-12-07 17:09:05 +08:00
jasonwshsu
c68ea17971 [Audio routing] Add strings for audio routing page for Android U
Bug: 237625815
Test: build pass
Change-Id: I0dfbf2a727e34695f23c68a7887c8ce966cf6b38
2022-12-07 16:56:50 +08:00
Zoey Chen
eef6d0cb24 Merge "[Settings] Update the title if launch the fragment from search app" 2022-12-07 08:43:10 +00:00
Zhenwei Chen
47fa893358 Merge "Fix batteryInfo unit test" into tm-qpr-dev 2022-12-07 08:31:44 +00:00
Chaohui Wang
eece0f702f Move config_isSafetyCenterLockScreenPendingIntentFixed
To res-export folder.

This resource is not used by Settings, but is exported for external
usage by other apps.

Put it into res-export folder to prevent from accidentally clean ups.

Bug: 234570979
Test: make Settings
Change-Id: Iff2a204a3dc4e97c19ef92997489760c3ed1505a
2022-12-07 15:37:53 +08:00
Zoey Chen
a3c97876bb [Settings] Update the title if launch the fragment from search app
Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47
2022-12-07 07:18:42 +00:00
Bonian Chen
854eb4947a [Settings] Code refactor for performance
Perform query in the background thread to reduce the time required for
rendering UI.

Bug: 260540995
Test: local
Change-Id: I4286553b44b51752ae64a9bb2ce5656fe7e9b4e8
2022-12-07 06:28:44 +00:00
Chaohui Wang
513827c5d5 Merge "Reduce flaky of whenCanDisplayLocalUi_displayed" 2022-12-07 06:14:48 +00:00
Chaohui Wang
4c11d02c10 Add back resources exported for external usage 2
These resources are not used by Settings, but is exported for external
usage by other apps.

Put them into res-export folder and add a README to prevent from
accidentally clean ups.

Bug: 234570979
Test: make Settings
Change-Id: Ia72cbde0b073ccb7624abeecb66e48d9c646f401
2022-12-07 14:09:57 +08:00
Zhenwei Chen
36c1e7dc20 Fix incorrect dock defender banner icon.
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Merged-In: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 52323128dc)
2022-12-07 05:46:57 +00:00
Chaohui Wang
b4a8e4b314 Reduce flaky of whenCanDisplayLocalUi_displayed
Bug: 246877208
Test: Unit test
Change-Id: I0b2554521b55fcfacc24e59a81ddc08b2eb9d70c
2022-12-07 12:03:47 +08:00
TreeHugger Robot
09d471132d Merge "Use PRIVACY_CONTROLS enum in PrivacyControlsFragment" 2022-12-07 03:45:44 +00:00
Tsung-Mao Fang
ff5bfb40c8 [DO NOT MERGE] FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-07 03:09:30 +00:00
Tsung-Mao Fang
b34ff2f272 [DO NOT MERGE] FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-07 03:08:58 +00:00
TreeHugger Robot
8318b2b7b6 Merge "[MTE] add more search terms for user toggle" 2022-12-06 23:54:27 +00:00