Commit Graph

511 Commits

Author SHA1 Message Date
Tetiana Meronyk
c502ee4540 Fix tests in UserDetailsSettingsTest and TimeoutToDockUserPreferenceControllerTest
Bug: 313530297
Test: atest UserDetailsSettingsTest && atest TimeoutToDockUserPreferenceControllerTest
Flag: EXEMPT fixing tests that were failing before
Change-Id: Ic4bd257aa26c6627d271acd1f22b59855bbddb20
2024-06-19 21:09:55 +00:00
Tetiana Meronyk
bac3e20cce Disable mRemoveUserPreference when mGuestUserAutoCreated only for guest.
Before this change, Delete action was disabled for all uninitialized secondary users.

Bug: 341840847
Test: atest UserDetailsSettingsTest
Change-Id: Icd43836f577dd061d267f6fb75658c35a0c47589
2024-06-11 16:25:06 +00:00
Tetiana Meronyk
b06a4f74a1 Merge "Make Multiuser toggle disabled for all non-main users" into main 2024-05-15 15:52:58 +00:00
Tetiana Meronyk
4e13fdcd37 Remove telephony related settings preferences for HSUM devices
Bug: 338358654
Test: atest UserDetailsSettingsTest
Change-Id: I53c3a8e4386b5d7738caffb42abf15dd33c360c7
2024-05-02 11:57:38 +00:00
Tetiana Meronyk
dc0c58b427 Make Multiuser toggle disabled for all non-main users
Only let main user (Owner) change state of the toggle
Bug: 336764498
Test: atest MultiUserSwitchBarControllerTest

Change-Id: Ib694d1cb4685764c64633efc090765b470a0a015
2024-05-01 17:21:14 +00:00
Treehugger Robot
72ba6ec2ca Merge "Rename Multiple users page to Users" into main 2024-05-01 09:47:56 +00:00
Tetiana Meronyk
177e852ea9 Rename Multiple users page to Users
Ensure it is still searchable by "multiple users" prompt.

Bug: 336764972
Test: manual
Change-Id: I1126bfe601b75532882d6158d82be1a3b566aefc
2024-04-30 18:48:40 +00:00
Tetiana Meronyk
86322e6398 Merge "Keep Multiuser toggle hint visible at all times" into main 2024-04-25 16:16:18 +00:00
Tetiana Meronyk
37ac9a393b Keep Multiuser toggle hint visible at all times
Bug: 336773027
Test: atest UserSettingsTest
Change-Id: Ib5f4ad674c4099a276c8c86d0ed96bdba956540c
2024-04-25 11:41:09 +00:00
Tetiana Meronyk
9e32702ded Add separate summary "Owner" for main user on the device
Bug: 298008926
Test: visual
Change-Id: I78ece410ab939a4727e44e371ae43779e96950e0
2024-04-23 17:38:49 +00:00
Jason Chiu
0bd014c497 [Safer intents] Settings misc
To avoid implicit intents, make intents launch explicitly.

Test: build
Bug: 323061508
Change-Id: Ie19cbceb89842a75a180898abcce81b63c18d46c
2024-03-29 04:22:45 +00:00
Chris Antol
9531458ca5 Merge "Multiple users yields a search result despite being disabled" into main 2024-02-05 20:36:03 +00:00
Adam Bookatz
84bc8a918d Settings: Profiles inherit call restrictions
Currently, if Settings applies CALLS or SMS restrictions to a user, that
restriction doesn't propogate to its child profiles. It should.

This is actually a no-op right now, since it's not possible to have a
profile on a user that isn't the Admin user anyway. But one day such a
thing may be allowed, so this implementation is more future-proof and
safer.

Test: Manual verification that applying the restriction continues to
work properly a full user
Test: UserDetailsSettingsTest
Bug: 261469887

Change-Id: Ib19cecbd37b6efc90f9655565295e7856427f049
2024-01-31 16:14:38 -08:00
David Magno
6fdeb081ae Multiple users yields a search result despite being disabled
'Multiple users' still yields a search result, even if the multiple
users functionality is unavailable on the device.

Bug: 298548379
Test: Manual
(cherry picked from https://partner-android-review.googlesource.com/q/commit:e7afc620ef3d9d7b05835c9bf31394cecf3b77b5)
Merged-In: I224668afacc115326ca9279d7b99bfe7d95ee79c
Change-Id: I224668afacc115326ca9279d7b99bfe7d95ee79c
2024-01-30 19:26:36 +00:00
Anna Bauza
ac717e4dc2 Avatar sync functionality
Send information to avatar sync service that user selected confirm or cancel on edit user info dialog

Bug: 320656026
Test: manual
Change-Id: I84356b844d47ea7c07f662691f1e48eaca56b7d8
2024-01-18 08:01:44 +00:00
Tetiana Meronyk
ebfd6f87f4 Merge "Revert "Disable multiuser toggle om COPE device and add explanat..."" into main 2023-12-14 17:54:48 +00:00
Tetiana Meronyk
1a81a9e942 Revert "Disable multiuser toggle om COPE device and add explanat..."
Revert submission 25262217-fix_mu_for_cope

Reason for revert: This issue requires a different approach to the solution.

Reverted changes: /q/submissionid:25262217-fix_mu_for_cope

Change-Id: Ic6e8afd76cb0af88612cf5a6cd34a0c7f50759c4
2023-12-14 15:38:03 +00:00
Edgar Wang
6024953f02 Remove injecting multi-user settings into settings itself
- It can improve performance because we use less injected item

Bug: 242152448
Test: robotest
Change-Id: I892e1ac9c3f8297c489fc1fec934e9f5f2e2f5e9
2023-11-21 21:05:54 +08:00
Treehugger Robot
af25484200 Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844 am: 202b3b147b am: 12d5f62933
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270

Change-Id: Ica69ec04685462749e97c2afde61d307dd4564b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 11:17:32 +00:00
Treehugger Robot
202b3b147b Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270

Change-Id: I5a9b318d5ce194fc7b4623a1d68085dd43b4a4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 09:57:05 +00:00
hoffc
f336657508 Settings: remove multiple users search when multi-user not supported
When multi-user feature not supported in framework, SettingsIntelligence should not build the index of multiple users for searching.

Return empty list when multi-user feature not supported during building search index.

Change-Id: Id2fb8f2066784d63bbfd5c396da88b04306a3563
Bug: 310108420
2023-11-13 14:36:32 +08:00
Tetiana Meronyk
80ae4b3c41 Disable multiuser toggle om COPE device and add explanation dialog
Bug: 304359233
Test: set up device in COPE mode and check toggle in Settings -> System -> Multiple Users

Change-Id: I0edd58651f94c9f9a51349025a29e33a1e1a9c14
2023-11-09 14:46:55 +00:00
Chaohui Wang
c4a3a50d58 Migrate to CompoundButton
Switch and SwitchCompat are both CompoundButton.

Using CompoundButton in Java will helps migration in the future.

Bug: 306658427
Test: manual - on affected pages
Change-Id: I7cdc2601879a85d33f77239e38263320d5a6984e
2023-10-25 14:57:48 +08:00
Chaohui Wang
cfdb3b1f1b Migrate new() to SwitchPreferenceCompat
Bug: 306658427
Test: manual - on Settings pages
Change-Id: I258a8c63d5c46403c6d333a9d2f34c33cb35e27f
2023-10-24 14:05:34 +08:00
Chaohui Wang
15ca95a31b Migrate to TwoStatePreference
SwitchPreference and SwitchPreferenceCompat are both TwoStatePreference.

Using TwoStatePreference in Java will helps migration in the future.

Bug: 306771414
Test: manual - check Settings pages
Change-Id: I84e1d7b09451106797c2b23d127855c6976678ca
2023-10-23 09:28:57 +00:00
Manish Singh
6efc455f2c Show a separate tab for the Private Space
This covers all the known Settings pages using the tabbed view model.

https://docs.google.com/document/d/1CdjUjAE84-5ZEPRIfw5KYFjLVHtEZxc_sF0w95su8DA/edit?resourcekey=0-dAACT9HRexY1IyoxMmkVlw#heading=h.58jd58rmznte

Screenshots:
all apps
https://screenshot.googleplex.com/3E5Jm7Pi2JfN64r
with work tab:
https://screenshot.googleplex.com/8egk4yHK5jSENjR

PS Apps Special media management apps
https://screenshot.googleplex.com/BHHafqW7bgUwSGg
with work tab:
https://screenshot.googleplex.com/3cocdhruEmCCh5k

PS Location Services tab view
https://screenshot.googleplex.com/3DqJcT2BFTEpvYT
with work tab:
https://screenshot.googleplex.com/6Avpx6hxSrdGJw5

PS on screen keyboard tab view
https://screenshot.googleplex.com/4FzVNnBWwbUeJNw
with work tab:
https://screenshot.googleplex.com/8E8UhpWq8PL5nxU

PS password account tab view
https://screenshot.googleplex.com/6bDR4AKtth2S3EW
with work tab:
https://screenshot.googleplex.com/9msXV2TdHdJapch

PS storage tab view
https://screenshot.googleplex.com/5Nk2FTxwdmpEv3B
with work tab:
https://screenshot.googleplex.com/79tw2EaWZKfMsnC

PS appl_languages_work
https://screenshot.googleplex.com/3qrREeg3RQdHhhH

Bug: 302278487
Test: manual
Change-Id: I8cd39170827fbe251bc4075ef306206020b3a022
2023-10-11 12:32:17 +01:00
Tetiana Meronyk
8489ae99dc Revert "Disable multiuser toggle when more than 1 user is created"
Revert submission 24420426-multi_toggle

Reason for revert: This change needs to be done along with some other UI changes to avoid confusion

Reverted changes: /q/submissionid:24420426-multi_toggle

Change-Id: Ife2e03d0090fefcb4c1fa53dd007336759eb1bc7
2023-09-07 15:50:09 +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
Tetiana Meronyk
d7a6a7f1ce Merge "Remove toggle "Turn on phone calls & SMS" from User Details of Main user" into main 2023-08-08 14:04:31 +00:00
Tetiana Meronyk
30ca0fbb3d Remove toggle "Turn on phone calls & SMS" from User Details of Main user
Admins should not be able to disable phone calls and SMS from the device owner.

Bug: 294846327
Test: atest UserDetailsSettingsTest
Change-Id: Ibb8532379c6e1e22fe45f2acb5191f8f6c7f3b0a
2023-08-08 09:53:33 +00:00
Chaohui Wang
2541381259 Fix references to resources for Settings
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
2023-08-08 01:56:05 +00:00
Tetiana Meronyk
6b27c08150 Fix keyboard showing after dialog dismissed
When dialog for creating user was dismissed with keyboard being displayed, the keyboard stayed on the screen and could not be released due to incorrect list of methods called on dialog dismissal. This CL topic fixes onDismiss() behaviour of this dialog. Videos of current behaviour and behaviour after fixed are attached to the bug.

Bug: 291865725
Test: atest UserSettingsTest
Change-Id: Ib3ade3de9228c8ba24e7ac2e235aaeec45efbe4e
2023-07-24 10:30:32 +00:00
Tetiana Meronyk
b88bad678d Fix "Allow guest to use telephony" toggle not updating its value
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
2023-07-04 15:32:14 +00:00
Treehugger Robot
e42dcd738d Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev 2023-06-29 16:42:19 +00:00
Tetiana Meronyk
f059fb9a27 Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev 2023-06-29 07:31:06 +00:00
Yasin Kilicdere
2d3fed86d1 After deleting guest user, switch back to previous instead of user0.
In Setting, after deleting or exiting the guest user, or failure to
reset the guest user involves switching back to user0, which is not
possible with HSUM (headless system user mode). With this CL we're
now switching back to previous foreground user instead of system user.

Bug: 283106632
Test: manual
Change-Id: Id60063cca75d9fded7dfe0b7d7a4b871d67c4b0c
2023-06-27 12:59:16 +01:00
Tetiana Meronyk
7c6f4ae19c Remove "Allow guest to use phone" from devices without telephony.
Bug: 282741809
Test: atest UserSettingsTest
Change-Id: I8c24dc021f1461c00765b41bf80f352948d14e43
2023-06-26 18:14:58 +00:00
Tetiana Meronyk
4899e50224 Add padding to dialog
Bug: 287265141
Test: on device with multiple admins enabled (default for HSUM) create a new
user and open User details view. Toggle Make this user an admin on/off.
Observe increased padding.

Change-Id: I216a91c4685eb12986cc4c61ae7be439358f55b2
2023-06-15 13:20:17 +00:00
Tetiana Meronyk
a0040c1402 Remove unused parameter from createDialog method in User Info edit dialog
Bug: 280568195
Test: atest EditUserInfoController
Change-Id: Ib31f7d61d1d3e624c1ae28fc38602fcf566af302
2023-05-30 16:41:47 +00:00
Tetiana Meronyk
d3335c2785 Make user creation flow in a single dialog
Bug: 266548780
Test: atest UserDetailsSettingsTest
Change-Id: I3df846aa480b80321269ac7b9b8723912597aba4
2023-05-04 15:18:35 +00:00
Tetiana Meronyk
0c7c7be962 Add confirmation dialog when granting/revoking admin privileges.
Bug: 266548780
Test: atest UserDetailsSettingsTest
Change-Id: I222ab6cbda138f0df379e6b6986b5ac462479833
2023-04-17 11:31:07 +00:00
Darrell Shi
a86614db74 Hide timeout to user0 pref when switching blocked.
Do not show the "timeout to admin user" settings preference when user
switching is blocked on the current user, e.g. in demo mode.

Test: atest SettingsRoboTests:TimeoutToDockUserPreferenceControllerTest
Bug: 255277938
Change-Id: Ibd0944c69254000a453f477eb72a0ba5832e9793
2023-03-31 22:14:35 +00:00
Victor Truong
f3c9a09cac Replace SystemUser checks with MainUser.
Bug: 257333623
Test: atest CommunalPreferenceControllerTest, atest UtilsTest, atest
TimeoutToDockUserPreferenceControllerTest

Change-Id: I5d2a818f9f35968ced1db7f9fa4b79432a502023
2023-02-01 15:16:48 -05:00
Tetiana Meronyk
2a06ccdfd5 Merge "Add UI metrics for granting admin rights from User Switcher" 2023-01-19 23:00:11 +00:00
Tetiana Meronyk
ff36d54d2c Add UI metrics for granting admin rights from User Switcher
Bug: 260697326
Test: manual
Change-Id: Ia4f3053bb84c5daaedb9a471b8a8f5dbaad66dba
2023-01-18 17:46:09 +00:00
Tetiana Meronyk
1f824d5c18 Add restriction to prevent user from being made an admin
Bug: 261700461
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserDetailsSettingsTest"
Change-Id: Ie518a17ae330e9b0864e5179dff7eb1d03f3937b
2023-01-18 00:09:13 +00:00
Tetiana Meronyk
b389e9d551 Allow creating admin users when 'config_enableMultipleAdmins' property is enabled
Bug: 262371063
Test: manual
Change-Id: I465901a8d689239d9dda252c5d6f37ec0853b317
2022-12-28 16:46:33 +00:00
Tetiana Meronyk
e5acef9034 Add UI for multiple admins on Headless
In a series of CLs under topic add_ui_for_hsum_admins UI and functionality for allowing multiple admins on HSUM build is added. In User settings and User switcher when creating a new user there is a new dialog prompting to choose admin status of the user to be created. In User details view there is a toggle that is visible to admin users that allows to modify admin status of existing users. This toggle is only applicable to full users that are not supervised, guests or a main device user.

Bug: 252790451
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserDetailsSettingsTest"
Change-Id: I447dc168be30aa614aeb3f8b71ad14a7223fd7c1
2022-12-21 11:02:39 +00:00
Anna Bauza
225c81df42 add settings log to remove and switch user
Bug: 260730616
Bug: 260733849

Test: croot && make RunSettingsRoboTests -j40
Change-Id: I870d6f53f377f293adb54c86d16cccf1bacac6a9
2022-12-20 18:36:18 +00:00
William Xiao
71ee3c3a5d Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev am: 0be191aeb7 am: 26343e8926
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683709

Change-Id: I63dedfa49ec3d7c64c156d6a5da33772abfcc4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 00:04:15 +00:00