Commit Graph

134108 Commits

Author SHA1 Message Date
Oli Thompson
111b073ca9 Add show emergency button call to biometric prompt
useDefaultSubtitle has to be set explicitly from promptInfo rather than being assumed true

remove subtext for managed profile challenge screen to create space for emergency call button

Test: manually tested
Bug: 286391641
Bug: 286422726
Change-Id: I848e00dcd0013124e59ef711c3615e6773c3d210
2023-08-15 16:52:36 +00:00
Tetiana Meronyk
7968047fc5 Disable multiuser toggle when more than 1 user is created
It makes more sense to have the toggle as on permanently as long as there are other users on the device. Otherwise if we toggle off "Allow multiple users", other users get hidden. Also with current behaviour the any admin can switch the toggle and this can block any other user, including main, from being able to use the device.

Bug: 295183792
Test: atest MultiUserSwitchBarControllerTest && UserSettingsTest
Change-Id: I8cb0671d780f45c17a9bb7c9a9d3b108128ead9d
2023-08-15 15:59:14 +00:00
Kohsuke Yatoh
c06c74af17 Merge "Define "Add network" preference in XML." into main 2023-08-15 14:39:28 +00:00
Elliot Sisteron
4cb0ecc069 Merge "Respond with null data when no screen lock." into main 2023-08-15 11:55:11 +00:00
Kohsuke Yatoh
bdfab1de26 Define "Add network" preference in XML.
Move the definition from Java to XML, so that SearchIndexProvider can
include it in the getXmlResourcesToIndex().
Also update getNonIndexableKeys() to return the corresponding key when
the preference is hidden.

If the Internet settings are restricted, "Add network" still appears on
search. When clicked, it opens the Internet settings page in restricted
mode, so that users can know that the settings are restricted.

Bug: 224421762
Fix: 224421762
Test: atest SettingsRoboTests:NetworkProviderSettingsTest
Change-Id: Ie9ea58070843a390844b461ce766f0ce29e64fab
2023-08-15 11:41:05 +00:00
Graciela Wissen Putri
08983e8e63 Add opt-out properties for aspect ratio settings
Don't display aspect ratio options if app has opted out. If app has
opted out only for fullscreen, other aspect ratio options should still
be shown.

Bug: 292583399
Test: UserAspectRatioManagerTest
Change-Id: Ia0b223536407f703826d775468c8f8a0b4822e23
2023-08-15 09:14:21 +00:00
Colin Cross
3cab6d2ef4 [automerger skipped] Fix kotlin nullable errors in Settings am: 753c96133a am: 918e687c93 -s ours am: d268d59869 -s ours
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 84f8961e67 is already in history

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

Change-Id: I3cbc2794ca43107496103393555451a3d8dd1fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 04:44:53 +00:00
Colin Cross
d268d59869 [automerger skipped] Fix kotlin nullable errors in Settings am: 753c96133a am: 918e687c93 -s ours
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 84f8961e67 is already in history

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

Change-Id: I1a0adea61c4a3a517db5593a71a0863a6434fb3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 04:22:59 +00:00
Colin Cross
918e687c93 Fix kotlin nullable errors in Settings am: 753c96133a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423375

Change-Id: I3b1e2e72e98bf2d0bdaaec2c247d2bd9ddfa872e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 03:39:25 +00:00
Colin Cross
6d3cbcdf75 [automerger skipped] Fix kotlin nullable errors in Settings am: 84f8961e67 -s ours
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 87b870a090 is already in history

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

Change-Id: If4eb9729494d88dd9b6e1e0a3337efe499b4498c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 03:38:24 +00:00
Colin Cross
2fc7f23fea Merge "Fix kotlin nullable errors in Settings" into main 2023-08-15 02:53:30 +00:00
Joshua McCloskey
2407b4033a Basic structure for fingerprint enrollment.
Bug: N/A
Test: Enroll introduction screen works as expected
Test: User is prompted with pin/pattern/pass if the token is not
present.

Change-Id: I32a182b09c3bcd9be43428c500bfae7b39a74e63
2023-08-14 21:09:16 +00:00
Colin Cross
84f8961e67 Fix kotlin nullable errors in Settings
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-08-14 12:30:16 -07:00
Colin Cross
753c96133a Fix kotlin nullable errors in Settings
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-08-14 12:29:53 -07:00
Colin Cross
87b870a090 Fix kotlin nullable errors in Settings
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
2023-08-14 12:29:02 -07:00
Joshua McCloskey
7623717788 Adding more tests for FingerprintSettingsV2
Test: atest FingerprintSettingsViewModelTest
FingerprintSettingsNavigationModelTest
Bug: 280862076

Change-Id: Ibb3d0112f394d6776fc1b346d226d9f7720cfed8
2023-08-14 18:30:21 +00:00
Justin McClain
7001ebd4e0 Updating RemoteAuthEnrollIntroductionTest and RemoteAuthEnrollFinishTest
Updating tests to use onView and withId like other RemoteAuth UX tests.

Bug: b/290769765
Test: atest RemoteAuthEnrollIntroductionTest RemoteAuthEnrollFinishTest
Change-Id: Ib3367b6ed39a5506b3777cb6dd1b909ce6e85502
2023-08-14 18:29:13 +00:00
Andreas Miko
4ca80e6013 Change nullability of inheriting function of PinPrivacyPreferenceController
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
Merged-In: Idbfa244921957be2bba3cd02e5e873e81e8807d8
(cherry picked from commit a7d7eb9a16)
2023-08-14 17:41:15 +00:00
Vlad Popa
beea9e488d [automerger skipped] Merge "Add list preference for BT audio device type selection" into udc-qpr-dev am: 3bf2649386 am: dc5fd85f24 -s ours
am skip reason: Merged-In I797a92e1af4025596ef1c603ed4ab59813e3cbf0 with SHA-1 a145082250 is already in history

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

Change-Id: I19ed4236e67121b94e1f810274982fd3b486a177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:32:41 +00:00
Vania Januar
eb83c22f62 Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev am: 85de68a968 am: ec9b0a08ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24282035

Change-Id: Id480cb6f6a0920c37a5bf8a8c4de68ce33225a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:32:16 +00:00
Vlad Popa
dc5fd85f24 Merge "Add list preference for BT audio device type selection" into udc-qpr-dev am: 3bf2649386
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24396815

Change-Id: I55438a3dc1368de726a86ef2280a2d8424d33113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:17:17 +00:00
Anvesh Renikindi
c82df409d8 [automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-qpr-dev-plus-aosp am: 4eb877cce7 -s ours
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 8d220f0641 is already in history

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

Change-Id: Id3336f6bc6a4b984174b42472ba67ffedb5b54e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:16:43 +00:00
Chaohui Wang
192c08179b [automerger skipped] Remove ExperimentalLifecycleComposeApi am: 2910d68343 -s ours
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 8d220f0641 is already in history

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

Change-Id: Ibd9baf2652af0781b9c94dba8f2000f269735371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:16:35 +00:00
Vania Januar
ec9b0a08ae Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev am: 85de68a968
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24282035

Change-Id: I458987476dd269d8802b97e730bc9f999c6c864f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 17:14:26 +00:00
Anvesh Renikindi
4eb877cce7 Merge "Remove ExperimentalLifecycleComposeApi" into udc-qpr-dev-plus-aosp 2023-08-14 17:00:10 +00:00
Vlad Popa
3bf2649386 Merge "Add list preference for BT audio device type selection" into udc-qpr-dev 2023-08-14 16:55:46 +00:00
Vania Januar
85de68a968 Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev 2023-08-14 16:47:40 +00:00
Elliot Sisteron
cea9ff385a Respond with null data when no screen lock.
Safety Center expects a response to the broadcast in this case.
The Settings app should respond with explicitely no data to Safety
Center rather than not respond.

Bug: 295845686
Test: atest LockScreenSafetySourceTest
Change-Id: Ibaa134b1f93304731f37444ab222b3dc628bae02
2023-08-14 14:11:05 +00:00
Xinyi Mao
322ad6a698 Merge "Impl the detect & show pipeline for PowerAnomalyEventList." into main 2023-08-14 03:27:36 +00:00
Justin McClain
a6325eac64 Remote authenticator settings layout.
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock. Settings will allow viewing registered
authenticators and unregistering authenticators.

Bug: b/293906744
Test: atest RemoteAuthSettingsTest
Change-Id: I91307a8449d384ecb8d4908f595a3bf6abaef2b5
2023-08-11 16:12:21 +00:00
Jeff DeCew
0761f46d09 Change Notification expander to use 10% opaque foreground color
Bug: 277285099
Test: post and cancel notifications; check history
Change-Id: I55f533eed8ad39a7ab3886d064f0ee0bd7c3b666
2023-08-11 12:10:20 -04:00
Chaohui Wang
2cab62254c Use resource processor for Settings
Bug: 293810334
Test: m Settings
Test: robotests
Change-Id: Ie515e137648eddfdfcab5e8095f5be99721d9e1b
2023-08-11 22:39:08 +08:00
mxyyiyi
4ea5aaf5ef Impl the detect & show pipeline for PowerAnomalyEventList.
Test: make SettingsLibRoboTests
Bug: 293813663
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c6f81c41e2806f384d2e465e89dadb7383048e8)
Change-Id: I0c477dc546ec4d00e4c4133afb61bf7d574be9f8
2023-08-11 13:24:39 +00:00
XingHai Lu
b199f3512a Merge "Add FeatureProvider for onboarding related settings" into main 2023-08-11 11:58:56 +00:00
XingHaiLu
10cf80af4c Add FeatureProvider for onboarding related settings
Add OnboardingFeatureProvider which will be used to B&R sound settings and
related tasks.
Bug: 289512753
Test: FakeFeatureFactory

Change-Id: I25e3b1f105ce0970cdf651400c153d8b4733029b
2023-08-11 16:53:56 +08:00
Wesley Wang
60f98c97e0 Update detectSettingsAnomaly() return type (1/2) am: a277f78789 am: 2545c9b3ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24364875

Change-Id: Ie2c7a649e3bc362cefe3fb31305edd904aa4a1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:35:52 +00:00
Xinyi Mao
aa78764e74 [automerger skipped] Merge "Updated PowerAnomalyEvent Proto." into udc-qpr-dev am: 49c4ba78dc am: b0822b1720 -s ours
am skip reason: Merged-In Id9fa88d6df0db50472732e4a50aa00a7a02db284 with SHA-1 66530d67bf is already in history

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

Change-Id: I2aeb96868ba8e2979aff71db1ed3ce114a19f002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:35:36 +00:00
Xinyi Mao
2227505e27 [automerger skipped] Merge "Improve battery tips cards." into udc-qpr-dev am: 3670fe1200 am: 0995018880 -s ours
am skip reason: Merged-In I356648d0fcec5dd1ea724297187ecafb5be55fd8 with SHA-1 14d0a1c102 is already in history

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

Change-Id: Ic9d3e2828c2d18b314bb56e18d77152b0f029b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:35:29 +00:00
Kuan Wang
1802841b00 Move static UsageStatsManager from DatabaseUtils to DataProcessor to am: 20ec9893d2 am: b01f52015d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24366174

Change-Id: I838b2a58bdf7dd41a7fd1eddf16acaeba1c87a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:34:44 +00:00
Eric Biggers
26293c811f [automerger skipped] Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c am: fdf07d6c35 am: 99abeaeec1 -s ours am: 06bd7afe86 -s ours
am skip reason: Merged-In I63f29c68f9a508fee0ee2f03f2cca33317fb8a32 with SHA-1 250f2727b0 is already in history

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

Change-Id: Ic96e34fdd39840c1fcbadf61f549526c2b0e43f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:28:57 +00:00
Eric Biggers
933e150e1f [automerger skipped] Stop calling LockPatternUtils.setVisiblePasswordEnabled() am: 08e6612a3d am: a386c78678 am: ecca6508da am: 47e19db82e am: e351ad55fc -s ours
am skip reason: Merged-In Ifb8fc93757366240cf37e4b9a600c2034302919e with SHA-1 bcee8ce1af is already in history

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

Change-Id: I369c798067e6388527c0405933b9a8bf68b9adf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:28:49 +00:00
Wesley Wang
2545c9b3ae Update detectSettingsAnomaly() return type (1/2) am: a277f78789
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24364875

Change-Id: I02e782eeee61d24e8990746a9993cfb06bfff802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:09:39 +00:00
Xinyi Mao
b0822b1720 Merge "Updated PowerAnomalyEvent Proto." into udc-qpr-dev am: 49c4ba78dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24329537

Change-Id: I2f3caff258868992d05598cf3c11f3f67d637b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:09:22 +00:00
Xinyi Mao
0995018880 Merge "Improve battery tips cards." into udc-qpr-dev am: 3670fe1200
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24328442

Change-Id: Iab17204c66df80d1249898ad1141c81234405bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:09:18 +00:00
Kuan Wang
b01f52015d Move static UsageStatsManager from DatabaseUtils to DataProcessor to am: 20ec9893d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24366174

Change-Id: I138d1f4732607dbca2a3578ab96ece91b280b01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 07:07:11 +00:00
Wesley Wang
a277f78789 Update detectSettingsAnomaly() return type (1/2)
Bug: 291689623
Test: make SettingsRoboTests
Change-Id: I3611e746900569dca8cf308072c1344686d27f9a
2023-08-11 06:56:14 +00:00
Xinyi Mao
49c4ba78dc Merge "Updated PowerAnomalyEvent Proto." into udc-qpr-dev 2023-08-11 06:34:05 +00:00
Xinyi Mao
3670fe1200 Merge "Improve battery tips cards." into udc-qpr-dev 2023-08-11 06:34:05 +00:00
Kuan Wang
20ec9893d2 Move static UsageStatsManager from DatabaseUtils to DataProcessor to
avoid reference from DataProcessor.

This is to fix the Accessibility tests hang issue.
Tested on main branch (https://android-build.googleplex.com/builds/abtd/run/L40400000962473343).

Test: make RunSettingsRoboTests
Bug: 293366011
Bug: 295026588
Bug: 295123907
Change-Id: I345e0c060165e4d06f98ada6b2e1ca3cbb4f911a
2023-08-11 06:30:59 +00:00
Eric Biggers
06bd7afe86 [automerger skipped] Merge changes from topic "locksettings-aosp-first" into main am: 137235a27f am: 71814b355c am: fdf07d6c35 am: 99abeaeec1 -s ours
am skip reason: Merged-In I63f29c68f9a508fee0ee2f03f2cca33317fb8a32 with SHA-1 250f2727b0 is already in history

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

Change-Id: I6d584ef0482b2eea4ce0a4b2de16fa7bac3598dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 03:49:36 +00:00