Commit Graph

19486 Commits

Author SHA1 Message Date
Zaiyue Xue
f24fd94b74 Merge "[Battery usage U] Create a flag to guard battery usage features" 2022-12-10 06:07:05 +00:00
Bonian Chen
d40d24d3b6 Merge "[Settings] Support search of each Sim slot status within about phone" 2022-12-10 05:31:25 +00:00
Dmitri Plotnikov
732ecf7d43 Make BatteryStatsHistoryIterator API compatible with Iterator
Bug: 261622968
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.google.android.settings.fuelgauge.BatteryInfoTest  RELAX_USES_LIBRARY_CHECK=true

Change-Id: I4b3cf18e4714017b412485120557eb22d7039118
2022-12-09 16:29:48 -08:00
Darrell Shi
d1f5edfc78 Update screensaver preference summary when on.
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".

Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'

Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
Merged-In: I40483f266c42a6e49e513208ba513d469d67f85a
2022-12-09 17:36:01 +00:00
Darrell Shi
adb864a784 Update screensaver preference summary when on.
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".

Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'

Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
2022-12-09 17:33:47 +00:00
Rupesh Bansal
9d0a16aab3 Merge "Remove VR features from apps" 2022-12-09 13:35:14 +00:00
Bonian Chen
8138e44fde [Settings] Support search of each Sim slot status within about phone
Support searching of each SIM slot status within about phone page.

Bug: 260540995
Test: auto and local
Change-Id: If905fc595af566665fb1077a5ce11a967f7487aa
2022-12-09 09:26:11 +00:00
Zaiyue Xue
fa90a4b311 [Battery usage U] Create a flag to guard battery usage features
Bug: 261800937
Fix: 261800937
Test: manual
Change-Id: I891c235228c9ca0709471b496e6f75167fd0a126
2022-12-09 15:15:34 +08:00
TreeHugger Robot
2bd5b1c75f Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev am: 47d87cb48d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20666966

Change-Id: I745c07401d1130ad320c476928f21d68c388f600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 05:55:31 +00:00
TreeHugger Robot
47d87cb48d Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev 2022-12-09 05:26:26 +00:00
Bonian Chen
ca5ef817ff Merge "[Settings] Code refactor" 2022-12-09 05:23:55 +00:00
Zaiyue Xue
691c39b862 Merge "[Battery usage U] Calculate each item pertage for App tab and System tab separately." 2022-12-09 02:40:33 +00:00
TreeHugger Robot
fe3250007b Merge "[Battery usage U] For system comsumed power, use device comsumed power directly instead of removing app comsumed power from it." 2022-12-09 02:32:55 +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
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
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
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
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
TreeHugger Robot
642a0a74a4 Merge "Check multiple security types for Wi-Fi NetworkRequest" 2022-12-07 14:25:58 +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
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
Bonian Chen
d73c751f3d Merge "[Settings] Code refactor for performance" 2022-12-07 10:25:49 +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
Zhenwei Chen
47fa893358 Merge "Fix batteryInfo unit test" into tm-qpr-dev 2022-12-07 08:31:44 +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
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
Bonian Chen
0a3438c194 Merge "[Settings] Add BT and WiFi reset option" 2022-12-06 16:08:32 +00:00
TreeHugger Robot
ccc77bf359 Merge "[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible." 2022-12-06 14:56:29 +00:00
Vania Januar
33419410ea Merge "Toggle for disabling stylus buttons." 2022-12-06 14:24:06 +00:00
Bonian Chen
dc6877f2ef [Settings] Add BT and WiFi reset option
Add an BT and WiFi reset option into factory reset menu.

Bug: 260034791
Test: local
Change-Id: I9031765cd5a012e3216971a3302176a96c2fbd23
2022-12-06 13:08:46 +00:00
Chaohui Wang
b62b890b71 Merge "Migrate AppPermissionSummaryTest to AndroidJUnit4" 2022-12-06 13:00:03 +00:00
Wesley Wang
dbd95eb47b Merge "Fix incorrect dock defender banner icon." 2022-12-06 11:57:23 +00:00
Tsung-Mao Fang
71f2d83688 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-06 11:45:08 +00:00
Tsung-Mao Fang
22869d9019 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-06 11:44:29 +00:00
PETER LIANG
14f145181f Merge "Fix the preview should keep the same layer after font or display size change." 2022-12-06 09:47:59 +00:00
Zhenwei Chen
52323128dc 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
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-12-06 09:40:50 +00:00
Zaiyue Xue
3d7b8b3bfe [Battery usage U] Show battery usage info immediately up till as close to the current moment as possible.
screen_record: https://drive.google.com/file/d/1Wdm8Wpn39k6E9Yo4bbTENf5VANP337QA/view?usp=share_link&resourcekey=0-1LNmaTaZI13DUmjNfkBehQ

Bug: 252407178
Fix: 252407178
Test: maunal
Change-Id: Ia08dea791bb72113719fd1316e8e9587a96eaef1
2022-12-06 17:36:55 +08:00
Tsung-Mao Fang
1cf31d17aa 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-06 09:27:45 +00:00
Bonian Chen
a1e8760494 Merge "[Settings] Code refactor - SIM slot UI preference key" 2022-12-06 08:30:50 +00:00
Betty Chang
6ef041d366 Merge "[LE Audio] Add broadcast icon when device is broadcasting but LE device is disconnected" 2022-12-06 08:03:59 +00:00
TreeHugger Robot
629f40c22b Merge "Support App and System tabs for battery usage breakdown." 2022-12-06 07:58:09 +00:00
Zhenwei Chen
b41e06a5fb Fix batteryInfo unit test
Bug:261139453
Test: Unit test passed
Merged-In: I8f94f984dc1bf833653ae49557fdd02f736b365c
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 54615b3bec)
2022-12-06 06:22:38 +00:00
Chaohui Wang
681b519b80 Migrate AppPermissionSummaryTest to AndroidJUnit4
Bug: 260441791
Test: Unit test
Change-Id: I72a63f9247ae370dbfcb0ff2babbfdfc95bd60a2
2022-12-06 13:28:39 +08:00
Bonian Chen
09bd704c45 [Settings] Code refactor - SIM slot UI preference key
Avoid from controlling Preference key separately in different places.

Bug: 261374879
Test: local & auto
Change-Id: I0a777c3f2511a25e8f619deba964bc343183c3cc
2022-12-06 05:12:19 +00:00
Zaiyue Xue
00fb008e9c Support App and System tabs for battery usage breakdown.
design_doc: go/usage-frontend-dd

screen_record: https://drive.google.com/file/d/1I8dnoMf7y9KUg0eVeqLJpHqGGOtaX6_0/view?usp=share_link&resourcekey=0-Mte0-LKN1LULRssg9t7zGg

Bug b/260786962 is also fixed in this cl.

Bug: 258123381
Bug: 260786962
Fix: 258123381
Fix: 260786962
Test: manual
Change-Id: Ifd337331d02dc10c3234c594b2e142bcd459c00f
2022-12-06 11:23:27 +08:00
Chaohui Wang
b9d4e85418 Merge "Add unit test for AllAppList" 2022-12-06 02:50:22 +00:00