summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/users
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Don't allow creating guest when can't create user" into lmp-devJason Monk2014-08-111-1/+17
|\
| * Don't allow creating guest when can't create userJason Monk2014-08-111-1/+17
| | | | | | | | | | | | | | | | When user restriction is on to disable adding user also stop the user from creating guests. Bug: 16782635 Change-Id: I0396172867e2e217ada9ef747ea62d0c0382c5dd
* | Show managed profile under accounts rather than usersAlexandra Gherghina2014-08-111-10/+4
|/ | | | | | | | Also fixes overflow menu to update on remove/add managed profile. Bug: 16234745 Bug: 16727076 Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
* Toggle between primary and managed profile in Print SettingsAlexandra Gherghina2014-07-295-192/+4
| | | | | | | | | This adds a spinner to the print settings screen which can be used to toggle between the Settings app in the primary and managed profile so that the user can edit settings belonging to both profiles. Bug: 16369104 Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
* Refactoring useless UserUtils classAlexandra Gherghina2014-07-283-37/+2
| | | | Bug: 16542609 Change-Id: Iadb83c5e378cd342ea89d6e224ddc45e6f940c8b
* More User Settings improvementsAmith Yamasani2014-07-264-16/+61
| | | | | | | | | | | | | Add a menu checkbox to allow creation of users from lockscreen. Add a delete icon in restricted profiles settings. Other little fixes to icons. Update some strings based on feedback. Bug: 15761405 Bug: 16550371 Bug: 16298824 Change-Id: Ib876bd57f15c6ce2d71856f72571c6b8b0e3102d
* Don't use the profile info for nameAmith Yamasani2014-07-251-17/+1
| | | | | | | | | Since we now have a way to directly edit the user's photo/name via a dialog, don't rely on the Me profile name anymore. That one will be out of sync with the manual nickname editing. Bug: 15761405 Change-Id: Ia16c43ddcfd47894b2d2e049802d7de153ea5b94
* Refactor User Profile editor dialog for reuseAmith Yamasani2014-07-246-433/+589
| | | | | | | | | Move the dialog code into a separate class. Use it from RestrictedProfileSettings and UserSettings for the current user. Bug: 15761405 Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
* Merge "Lockdown 'remove user' with user restriction in Settings for phones." ↵Julia Reynolds2014-07-221-0/+3
|\ | | | | | | into lmp-dev
| * Lockdown 'remove user' with user restriction in Settings for phones.Julia Reynolds2014-07-171-0/+3
| | | | | | | | | | Bug: 16367204 Change-Id: I87a30412e89ecb2ae3e7d57edc347cd5b2d1e354
* | Merge "Add the capability to set a pinned header to ↵Fabrice Di Meglio2014-07-211-3/+1
|\ \ | | | | | | | | | SettingsPreferenceFragment" into lmp-dev
| * | Add the capability to set a pinned header to SettingsPreferenceFragmentFabrice Di Meglio2014-07-211-3/+1
| |/ | | | | | | | | | | | | | | - add a FrameLayout into the preference list fragment - add public void setPinnedHeaderView(View pinnedHeader) and clearPinnedHeaderView() APIs for adding and clearing the pinned header Change-Id: I50ba5dd150167e0d49cc54bee1203f46db6d7a66
* | Follow API change from *Blocked to *HiddenAmith Yamasani2014-07-211-7/+7
| | | | | | | | | | Bug: 16191518 Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be
* | Improvements to user settingsAmith Yamasani2014-07-171-18/+91
| | | | | | | | | | | | | | | | | | Exiting guest mode from within guest user. Updated assets and cleaned up/optimized some asset clipping code. Bug: 15761851 Bug: 16355550 Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69
* | Follow split of DISALLOW_TELEPHONYAmith Yamasani2014-07-171-6/+11
|/ | | | | | Save both DISALLOW_OUTGOING_CALLS and DISALLOW_SMS together. Change-Id: I06dd23b3fb4a21f3a22661da17491fc5b0bce4ed
* Multiuser settings revamp - followup to address commentsAmith Yamasani2014-07-104-62/+11
| | | | | Bug: 15761405 Change-Id: I9c03432a2f2651a931486ce65fb3b5af37608be0
* Multiuser settings revamp for L, first passAmith Yamasani2014-07-016-35/+300
| | | | | | | | | Include Guest settings Ability to switch users from Settings Manage user settings like telephony access Bug: 15761405 Change-Id: I2cfdc7bc2703ed202aa8bf1261c304c51ce48b29
* Merge "Remove PIN from users page - use disallow_add/remove_user restrictions."Julia Reynolds2014-06-102-8/+7
|\
| * Remove PIN from users page - use disallow_add/remove_user restrictions.Julia Reynolds2014-06-112-8/+7
| | | | | | | | | | Bug: 14081992 Change-Id: If4973d64ae54da602a2682dee5b868ff66273856
* | Remove all dialog icons in SettingsAlan Viverette2014-06-101-1/+0
|/ | | | | BUG: 15474733 Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
* Show user management UI if a managed profile existsAmith Yamasani2014-06-061-2/+5
| | | | | | | | | | | Show UI even if flags to show multiuser UI are off, if there's a second user on the device. This way there's an affordance to remove the user. Don't show the "Add user" item though. Bug: 15447068 Change-Id: I40273005d6d8d66aed486328615acdab71d51fa4
* Don't allow restricted profile creation for corp/edu owned devicesAmith Yamasani2014-05-091-5/+20
| | | | | Bug: 14613459 Change-Id: I64dfba35418def8ae8793d7371b8960f5ff5946f
* Switch to using the new enabled flag in UserInfoAlexandra Gherghina2014-05-011-2/+1
| | | | | Bug: 14377459 Change-Id: Ief309477d964f1158087240ce24030335652d6a7
* Disable profile enabled check (API is changing)Alexandra Gherghina2014-04-281-3/+2
| | | | | Bug: 14377459 Change-Id: Ie79db95bcc5c7e3a95b479832dceaf628ae36728
* Revert "Revert "Wiring for displaying managed profiles""Alexandra Gherghina2014-04-241-3/+15
| | | | | | | | | This reverts commit 91e3f7256935f1c805878c3a5241b9e5b9a67e44. Will wait until related commit is in to submit this. Bug: 13756871 Change-Id: I34642998adb71f44de1e529cc214ac4f921932ed
* Revert "Wiring for displaying managed profiles"Alexandra Gherghina2014-04-231-15/+3
| | | | | | | | This reverts commit a044235272d5319ed3b1dd1aebc051b88ec69c1a. This depended on CL: https://googleplex-android-review.googlesource.com/#/q/I2907b182e19b3562592da688b3f68ef5f4088557 which was not commited yet. Bug: 13756871 Change-Id: Ib05c58002a06c7882c4b6dfd750c9681ff4b1646
* Wiring for displaying managed profilesAlexandra Gherghina2014-04-151-3/+15
| | | | | Bug: 13756871 Change-Id: I81898e3b32baa0bc9ec72258b3bd470102d42b68
* Fix bug #13758772 Crash when hitting back after clicking on add a restricted...Fabrice Di Meglio2014-04-041-2/+0
| | | | | | | | ... profile under Users - no need to show the dialog again when we have pressed on BACK Change-Id: I76f155a488512689c5af40ff35b80ce034da4ffe
* Don't allow user creation on phones via Settings searchAmith Yamasani2014-03-261-0/+11
| | | | | | | | | | | | This screen was blocked from appearing in the main Settings list, but search now exposes it. Disable content on the Users screen if multiple users are not supported on the device. This is a temporary fix until Settings search does the right thing. Bug: 13631986 Change-Id: Icc61d3e9ce4e405d0cf8841af538216be59fac26
* Remove some usages of deprecated location APIsTom O'Neill2014-03-052-4/+4
| | | | | Bug: 13302202 Change-Id: I916568d2b310eaf9a8b30da9a9980344aaf76c21
* Use Drawer in Settings appFabrice Di Meglio2014-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | - get rid of PreferenceActivity as much as we can and use fragments instead - add Drawer widget - add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL) - add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external call thru an Intent Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we would have two Home). Also, verified that: - the WiFi settings still work when called from SetupWizard - when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
* Exit restrictions fragment if user was deletedAmith Yamasani2013-10-032-4/+23
| | | | | | | | | When resuming the restricted user fragment, make sure that the user still exists, as it may have been deleted by the restricted user. Bug: 11010340 Change-Id: I3360dbc42586c5bb28013844f8c788e641ad8b6a
* Don't crash on rotation when cropping a profile pictureAmith Yamasani2013-09-131-7/+21
| | | | | | | | Bug: 8910780 Keep track of pending activity result and avoid deleting the intermediate file. Change-Id: I56f63e1348c8b1f5229ad3e135016b8b75d3a335
* Fix profile picture picking for restricted profilesAmith Yamasani2013-09-101-32/+99
| | | | | | | | | | | | | | | Due to the new file picker UI and incorrect assumptions of access to sd card, have to use content provider Uris instead of file paths. Also makes the cropping robust in the event of not having a cropping intent on the platform. This should make the code play well with third party image and camera apps as well. Bug: 10666584 Change-Id: Ie8d834fe7aac96bc14829a7be084512a15ef4001
* Fixes for pin-restricted settings.Maggie Benthall2013-08-291-7/+2
| | | | | | | | | - Reprompt for pin after screen has been locked and unlocked. - For protected preferences, store the Preference and continue if pin entry is successful. - Protect whole UserSettings and DevelopmentSettings pages. Bug: 10543207 Change-Id: If1d4b31ca94a8cfc103625b74385bcd0bdd3d88b
* Merge "Don't list apps that are disabled by the system" into klp-devAmith Yamasani2013-08-271-2/+26
|\
| * Don't list apps that are disabled by the systemAmith Yamasani2013-08-161-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | This is to make sure that apps that were disabled for some reason such as inappropriateness for a locale or for a specific device, don't show up as available to enable for a restricted profile. But in the case that the app was already enabled for the target profile, show it in the list so that it can be disabled if necessary. Bug: 10229133 Change-Id: I3c19edb7364cea42d95b619781e0326543b9a1cf
* | Fix custom restrictions launch mechanismAmith Yamasani2013-08-201-38/+42
|/ | | | | | | | Instead of showing a separate entry for launching custom restrictions, launch it directly when clicking on the settings icon. Bug: 10388399 Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
* Merge "Pin protect more screens."Geoffrey Borggaard2013-08-061-10/+16
|\
| * Pin protect more screens.Geoffrey Borggaard2013-08-061-10/+16
| | | | | | | | | | | | | | | | When these screens are locked down with user restrictions, it should prompt the user for the restrictions pin before allowing access to the settings screen. Change-Id: Iadbb087da2d9470b855ea0bea89f2da1ffb9e854
* | Remove Restrictions UIAmith Yamasani2013-08-061-152/+0
|/ | | | | Bug: 10200097 Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30
* Don't show Restrictions item if it has been disabled for the user.Amith Yamasani2013-07-221-5/+13
| | | | | | | Also don't show actual Restrictions content if the fragment was launched through a different entry point. Change-Id: I70cb76ca6f68a382e68219053e6f69e7f1fa0150
* Remove spurious importAmith Yamasani2013-07-191-2/+0
| | | | Change-Id: I91172626f4ec64c0fc7497f9f7d11244ca49a341
* Apply restrictions right away instead of on exitAmith Yamasani2013-07-182-78/+159
| | | | | | | | | | | | | | | | | Use usermanager to clear restrictions, as it needs to do a bunch of book keeping. Apply PIN restriction to master clear button. Changing existing PIN now includes verifying the PIN, so it doesn't need to be cleared here in Settings. Removed automatic persisting of restrictions on receiving them unless it is a restricted profile. Make apps that are signed with platform certs immutable and ON. Change-Id: Iffd1bf2eb0d18202fb66ddcf80668baa8e6b84ed
* Potential fix for Settings instability on x-large.Amith Yamasani2013-07-151-1/+1
| | | | | Bug: 9752185 Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
* Fix accidental creation of restriction entry for required appsAmith Yamasani2013-07-091-1/+2
| | | | | | | | When entering Settings->Restrictions, don't automatically query restriction entries for required apps. Bug: 9681399 Change-Id: Idcc773bf4793b3e7e2b328a15881b7ecf930c6c3
* Don't start the loader task if one is already runningAmith Yamasani2013-06-281-1/+4
| | | | | | | This should appease the monkeys. Bug: 9619255 Change-Id: Idbac0bd86acafbdb636b0b18e09fcbb9eea15cc4
* Single-user restrictionsAmith Yamasani2013-06-254-451/+691
| | | | | | | | | New restrictions panel for restricting list of available apps for the user. Apps that support restrictions can also be configured here. Restrictions screen is PIN protected and will ask you to create a PIN the first time you use it. Change-Id: I7a5267df4272521ad80e6a8b6a18932d07179eb8
* am 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-devAmith Yamasani2013-06-071-0/+11
|\ | | | | | | | | * commit '893bdcd5312f314da7925f22345cb4efe0e1c442': Allow hidden apps to opt-out
| * Allow hidden apps to opt-outAmith Yamasani2013-06-061-0/+11
| | | | | | | | | | | | | | | | | | When a system app doesn't have any UI, it wasn't being considered for opt-out. Check for all system apps that want to opt-out and mark them for uninstallation. Bug: 8908632 Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219