Commit Graph

44671 Commits

Author SHA1 Message Date
Michael Mikhail
56e5b3da96 Add media on lock screen setting
Add a new setting that controls whether media on lock screen is enabled,
disregarding the notifications status. The new setting is available
under media and privacy settings.

Bug: 229915240
Test: atest MediaControlsLockScreenPreferenceControllerTest
Change-Id: I054f36efd635dc0535551d3058f9faf92196349d
2022-08-18 11:57:13 +00:00
Pajace Chen
f3496399dd Implements the buttons layout for the extra defend
Bug: 235246949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.widget.CardPreferenceTest
Test: manual test
Change-Id: I1dc4ab31adf85c684a4c09bd6c9bcfb54b52dc3c
2022-08-18 10:16:05 +00:00
Kuan Wang
4db5c6ba57 Port new version battery usage chart implementation from master to tm-qpr-dev.
This cl is a merge of the following 36 cls:
ag/19250259	Duplicate BatteryChartPreferenceController and BatteryChartView into new files for better diff review purpose
ag/19279660	Use Mockito 4.6.1 API for BatteryChartPreferenceControllerV2Test
ag/19267975	Add class BatteryLevelData used to parcel the battery timestamps and levels. It behaves as an interface between UI and data.
ag/19289086	Refactor BatteryChartView X-axis labels. Instead of only timestamps, also support any string[] labels.
ag/19238586	Add interpolation for the history data since last full charge loaded from database.
ag/19331746	Return raw history map in function getHistoryMapSinceLastFullCharge.
ag/19308838	In BatteryChartViewV2, use levels.length-1 to replace mTrapezoidCount. So the chartview could show any number of slots as the given levels length-1.
ag/19332266	Add class BatteryDiffData used to parcel battery usage data
ag/19331467	Refactor Battery Chart View State Controll
ag/19358207	Add DataProcessor to process raw history map for UI.
ag/19332276	Add battery chart view model.
ag/19394744	Update trapezoid validation in battery chart view.
ag/19379730	Support daily and hourly battery chartview.
ag/19428426	Improve X axis labels in battery chart (1)
ag/19446215	Improve X axis labels in battery chart (2)
ag/19394745	Add the async task to compute diff usage data and load labels and icons.
ag/19447624	Support showing app usage list for two battery charts
ag/19500907	Updates battery usage messages from last 24hr to last full charge. (Part1: V2 files)
ag/19505324	Update the selected period message in battery chart
ag/19500905	Updates battery usage messages from last 24hr to last full charge. (Part2: non-V2 files)
ag/19510363	Update usage data for EBS app usage list and App usage detail from 24 hours to last full charge.
ag/19523184	Update usage data for EBS app usage list and App usage detail from 24 hours to last full charge.
ag/19534864	Add margin between battery daily and hourly charts
ag/19491093	Always do interpolation for battery level data in daily chart.
ag/19565630	Avoid NullPointerException when batteryLevelData is null.
ag/19561239	Fix b/241872474 Battery usage page will crash when selecting the last hour chart bar, going to app detail page, and going back
ag/19565633	Fix b/241885070: Unexpected texts moving when going back to battery usage page
ag/19534850	New way to draw battery chart axis labels
ag/19561240	Switch Battery Usage Chart from V1 to V2.
ag/19561338	Switch Battery Usage Chart from V1 to V2.
ag/19600174	Fix b/242254055 Battery usage initial screen improvements (long data loading time)
ag/19600284	Fix b/242252080: Add padding space on the top of the battery chart
ag/19647338	Consider usage map valid even if [all][all] is null.
ag/19634227	Use new content uri everytime to avoid cache
ag/19600177	Fix b/242009481: Refine the battery usage chart timestamp label rule
ag/19647337	Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case.

Test: manual
Bug: 239491373
Bug: 236101166
Bug: 236101687
Fix: 236101166
Change-Id: I7de8d9dcee14627da10752534991f1ec9f616020
Merged-In: I9142c0d4e00dea3771777ba9aedeab07b635fa1a
2022-08-18 10:53:41 +08:00
Joe Bolinger
e167f9ed0a Cache context for generateChallenge response.
Fix: 232678514
Test: manual
Change-Id: I7deac5f296260bf667b15300e600195c42c0cbc1
2022-08-18 00:49:38 +00:00
Treehugger Robot
48b4af999a Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650 am: ac7a368afd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I0ebc25250b00a36bef5a72dd87192013b08e098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:53:49 +00:00
Treehugger Robot
ac7a368afd Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984 am: 49a0bbc650
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I9c4c43088154202d5818b29d010f053a7630ec90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:29:36 +00:00
TreeHugger Robot
aa21979d79 Merge "Fix b/242009481: Refine the battery usage chart timestamp label rule" 2022-08-17 20:27:55 +00:00
Treehugger Robot
49a0bbc650 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b am: cdacabf984
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I1ce70edf6d735df8340f4ec483dbe3fc4df7b897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 20:11:01 +00:00
Treehugger Robot
cdacabf984 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: Iac4c2bea65889fbb3847794fc7a8b1d23ff2f9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 19:44:42 +00:00
TreeHugger Robot
2bc09010d8 Merge "Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case." 2022-08-17 19:01:27 +00:00
Treehugger Robot
a93e78f781 Merge "Fix array-related errorprone warnings" 2022-08-17 18:37:46 +00:00
Tsung-Mao Fang
56c191d288 Wi-Fi panel doesn't need to check permission am: 5e785a2d99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I78c410c92c0d7f8d828fab92db97303814a09ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 18:03:31 +00:00
TreeHugger Robot
7f32697692 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I65697bb252fe44e18cbca6ca1a7b74e8d66f18ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 17:47:32 +00:00
Kweku Adams
cda2d13a3c Properly reflect the default value.
The switch should be on if the default state is on. Also, make sure the
revert button is accessible if the default value is on.

Bug: 240726265
Test: Toggle the switch and then Revert to Defaults with the default value as on
Change-Id: I07d1713316281b0590fab7f1581e15d9f5e57969
2022-08-17 17:34:30 +00:00
TreeHugger Robot
86f436dd0d Merge "Consider usage map valid even if [all][all] is null." 2022-08-17 14:43:48 +00:00
Zaiyue Xue
e716055e45 Fix b/242809981 Charge battery to 100% when battery usage page opened, the chart will refresh, but the app list isn't refreshed in that case.
Bug: 242809981
Fix: 242809981
Test: manual
Change-Id: I303bbc2679f70ef16636c28f6364381f49457387
2022-08-17 12:59:50 +00:00
Kuan Wang
508d938bc8 Consider usage map valid even if [all][all] is null.
Bug: 242835128
Fix: 242835128
Test: manual
Change-Id: Icd8e157f08d741604b5769464d74660651eb69df
2022-08-17 19:18:16 +08:00
Zaiyue Xue
b4fe32640f Fix b/242009481: Refine the battery usage chart timestamp label rule
Draw the first and the last labels. Then recursively draws axis labels between the start index and the end index. If the inner number can be exactly divided into 2 parts, check and draw the middle index label and then recursively draw the 2 parts. Otherwise, divide into 3 parts. Check and draw the middle two labels and then recursively draw the 3 parts. If there are any overlaps, skip drawing and go back to the uplevel of the recursion.

screenshots: https://drive.google.com/drive/folders/11AJ4Fz6xS76LGlbAy9WfvjZpffgFkMji?resourcekey=0-HBWCQa1oQW4e0UfvLzEXGQ&usp=sharing

Bug: 242009481
Fix: 242009481
Test: manual
Change-Id: Iaa9019feba7693638d5ae64bbbee7298eb74f749
2022-08-17 08:50:54 +00:00
Julia Reynolds
d1344b38dc Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226 am: 80e1ca7c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197

Change-Id: I80cbd2726cf3609a1f266e46b728b1d632ea8abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 08:35:03 +00:00
Menghan Li
84374522ea Merge "[Captioning preferences] Fix wrong color if default color selected" 2022-08-17 08:20:48 +00:00
Angela Wang
82140a2b73 Merge "Fix wrong visibility of link button in a11y tutorial dialog" 2022-08-17 07:38:46 +00:00
Weng Su
dc4ad09291 Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
2022-08-17 07:07:17 +00:00
Robert Luo
c6d8ef82c4 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491096

Change-Id: Id56424de408fca4a14807e29560a5694c4a63705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 04:58:02 +00:00
Robert Luo
63aca8e131 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev 2022-08-17 04:28:08 +00:00
menghanli
0ed28e9fd0 [Captioning preferences] Fix wrong color if default color selected
Root cause: When the default captioning color was selected, the opacity became 100% and made the opacity preference is disabled. After changing to non-default color, the opacity preference becomes enabled, but it keeps showing cached opacity in opacity preference and the preview still shows the wrong color.

Solution: Cache the latest opacity if default captioning color was selected to show the correct opacity later.

Bug: 241308551
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I7712fb25d622da62d7fb2d017e33f94ef258941b
2022-08-17 12:00:43 +08:00
Jason Hsu
cd76ba8821 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev am: f21593c870
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569012

Change-Id: Iaa33b5b62f4940559c8fc630022456971f8fae11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 03:32:25 +00:00
Jason Hsu
f21593c870 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev 2022-08-17 02:43:47 +00:00
Tsung-Mao Fang
5e785a2d99 Wi-Fi panel doesn't need to check permission
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-17 02:43:03 +00:00
Diya Bera
347cd8bca3 Removed redundant face unlock option.
Test: To be updated.
Fixes: 234309000
Change-Id: I5fcf682860de9b76d61878df04182bc382292f56
2022-08-16 22:48:25 +00:00
Tiffany Nguyen
3acd34fe4a Move restricted apps page to new battery optimization page.
New entry: https://screenshot.googleplex.com/BbU6RnQhBbpnBc3.png
Restricted: https://screenshot.googleplex.com/5ggid7TcSsH9CUF.png
Old entry: https://screenshot.googleplex.com/7JgZpSfKs5zZb3Z.png

Bug: 240711616
Test: manual
Change-Id: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
2022-08-16 22:38:05 +00:00
Chloris Kuo
41e650c223 Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev am: 4d4bf61c4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19641993

Change-Id: I11f45faad393404ba00d464d7caea674360428ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 20:26:21 +00:00
Chloris Kuo
4d4bf61c4c Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev 2022-08-16 20:05:46 +00:00
Julia Reynolds
80e1ca7c54 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197

Change-Id: Iffe89254913fab91b02e3e5db18939912204de40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 19:55:23 +00:00
Chloris Kuo
359929732d Fix settings crash when enhanced notification shown in search results
init NotificationBackend in constructor and set isSliceable to false in
search result since the NAS enabling logic is required and is in the
parent fragment ConfigureNotificationSettings.

Bug: 237251075
Test: test manually on device
Change-Id: I9082d6eda27784cf378a0d06304b5fc1e2ae6d7f
(cherry picked from commit 26ce9a98f0)
2022-08-16 17:08:17 +00:00
Julia Reynolds
dbaa419226 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev 2022-08-16 17:07:18 +00:00
Hugh Chen
2358afae79 RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622

Change-Id: I3dd165a645a1bb63613d541453e32d7c943df776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 04:37:06 +00:00
TreeHugger Robot
ea3f9f337e Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev 2022-08-16 04:03:12 +00:00
Tsung-Mao Fang
d2c372450c Wi-Fi panel doesn't need to check permission
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
2022-08-16 03:59:56 +00:00
Jack Yu
f8b664e31f Only primary user is allowed to control secure nfc
Bug: 238298970
Test: manual
Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313
2022-08-16 02:59:18 +00:00
Cole Faust
a21ac03acb Fix array-related errorprone warnings
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ida6513002f8fd845a385924be290b720f06c4748
2022-08-15 18:52:37 -07:00
Julia Reynolds
2a61b3656b Update Bridged app link when NLS access changes
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
2022-08-15 17:50:49 +00:00
Weng Su
911573f2e1 [RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
(cherry picked from commit 2732be59e5)
2022-08-15 13:31:52 +00:00
Weng Su
028c8f3dbc Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID
- Because the wifiConfiguration save the carrier ID only for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- To avoid user confusion, show one SIM only when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test

Change-Id: I56f956d20053d314f082ba185d661d8e0a0ef3cb
Merged-In: I56f956d20053d314f082ba185d661d8e0a0ef3cb
2022-08-15 13:25:47 +00:00
Zaiyue Xue
c931670a99 Fix b/242252080: Add padding space on the top of the battery chart
screenshot: https://screenshot.googleplex.com/9XU9Yiwv9YAVd46.png

Bug: 242252080
Test: manual
Change-Id: I81730168337b311600a12b844753848c21105d46
2022-08-15 16:19:19 +08:00
Angela Wang
67efcacbc1 Fix wrong visibility of link button in a11y tutorial dialog
Root cause: the visibility of link button is not correctly set due to
the onPageSelected callback isn't called when the first page shows

Solution: Manually set the visibility of link button according to the
first tutirial page type when dialog is shown

Bug: 242141428
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I33ed07bc7ae39d96baeeed85771c5f13e00ebf44
2022-08-15 06:01:17 +00:00
Chloris Kuo
ec46abccf7 Merge "Fix settings crash when enhanced notification shown in search results" 2022-08-12 23:00:21 +00:00
Ats Jenk
c2fae645f0 Merge "Developer tile for toggling desktop mode" into tm-qpr-dev am: 3f000fa764 am: 7dad9f50a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18975659

Change-Id: I45d7ac7982ea7306ae2ed069920c201f3116ba54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 17:06:30 +00:00
Ats Jenk
7dad9f50a9 Merge "Developer tile for toggling desktop mode" into tm-qpr-dev am: 3f000fa764
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18975659

Change-Id: I11cc8ff6ad5b704ecb6c20f5b5975c7cb2cb14a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 16:40:24 +00:00
Ats Jenk
3f000fa764 Merge "Developer tile for toggling desktop mode" into tm-qpr-dev 2022-08-12 16:22:44 +00:00
TreeHugger Robot
5cf9730c31 Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev am: cfd4e87ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19604134

Change-Id: Iece6c6ec5fa09ff8fb5861175742c739b653f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 15:49:19 +00:00