Commit Graph

128 Commits

Author SHA1 Message Date
Amith Yamasani
92c5452f08 Change the location mode before applying restrictions
Once the location sharing restriction is applied, the setting cannot
be changed, so change the setting first.

Bug: 17348894
Change-Id: I9dcad230e816aaa2482f1f35f1993f51d14eabc7
2014-09-02 17:48:31 -07:00
Amith Yamasani
3391321e2f Fix toggle button clickability in app restrictions
Also fix side padding

Bug: 17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
2014-08-25 15:20:34 -07:00
Amith Yamasani
f7ba74df59 Switch user on clicking on a user in User Settings
This slipped out of the code somehow.

Bug: 15761405
Change-Id: I89c47221f999d5ef23aa7910d31a95bfa730353c
2014-08-22 12:33:23 -07:00
Amith Yamasani
94c0181c8f Update strings for guest removal affordance and dialog
Exit guest -> Remove guest
etc.

Bug: 16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
2014-08-18 16:42:43 -07:00
Amith Yamasani
561d6bc9bb Merge "Allow creating last user even if a guest exists." into lmp-dev 2014-08-13 16:52:03 +00:00
Amith Yamasani
f2663abe1d Allow creating last user even if a guest exists.
Bug: 15934700

Also fix missing icon when user has no icon.

Change-Id: I07c76043df9cda8aeccecb09289d570845dc4560
2014-08-11 17:17:29 -07:00
Jason Monk
918c23bd5f Merge "Don't allow creating guest when can't create user" into lmp-dev 2014-08-11 17:09:03 +00:00
Jason Monk
7c2739888a Don't allow creating guest when can't create user
When user restriction is on to disable adding user also stop the
user from creating guests.

Bug: 16782635
Change-Id: I0396172867e2e217ada9ef747ea62d0c0382c5dd
2014-08-11 10:22:43 -04:00
Alexandra Gherghina
83adb564de Show managed profile under accounts rather than users
Also fixes overflow menu to update on remove/add managed profile.

Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
2014-08-11 10:02:13 +01:00
Alexandra Gherghina
fe47a8dc89 Toggle between primary and managed profile in Print Settings
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
2014-07-29 10:22:15 +01:00
Alexandra Gherghina
95b86a5488 Refactoring useless UserUtils class
Bug: 16542609
Change-Id: Iadb83c5e378cd342ea89d6e224ddc45e6f940c8b
2014-07-28 07:40:48 +00:00
Amith Yamasani
247520c369 More User Settings improvements
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
2014-07-26 14:09:43 +00:00
Amith Yamasani
2d578ce293 Don't use the profile info for name
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
2014-07-25 09:37:33 -07:00
Amith Yamasani
ee3987475e Refactor User Profile editor dialog for reuse
Move the dialog code into a separate class.
Use it from RestrictedProfileSettings
and UserSettings for the current user.

Bug: 15761405
Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
2014-07-24 23:13:34 +00:00
Julia Reynolds
baffc88924 Merge "Lockdown 'remove user' with user restriction in Settings for phones." into lmp-dev 2014-07-22 21:50:21 +00:00
Fabrice Di Meglio
aed4c7284e Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev 2014-07-21 15:43:35 +00:00
Fabrice Di Meglio
86159283c9 Add the capability to set a pinned header to SettingsPreferenceFragment
- 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
2014-07-21 16:16:23 -07:00
Amith Yamasani
fca31ca418 Follow API change from *Blocked to *Hidden
Bug: 16191518
Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be
2014-07-21 22:19:09 +00:00
Amith Yamasani
c16b73e92b Improvements to user settings
Exiting guest mode from within guest user.
Updated assets and cleaned up/optimized some asset clipping code.

Bug: 15761851
Bug: 16355550
Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69
2014-07-17 20:22:08 -07:00
Julia Reynolds
ea1d3ef6ce Lockdown 'remove user' with user restriction in Settings for phones.
Bug: 16367204
Change-Id: I87a30412e89ecb2ae3e7d57edc347cd5b2d1e354
2014-07-17 09:59:28 -04:00
Amith Yamasani
920c57d499 Follow split of DISALLOW_TELEPHONY
Save both DISALLOW_OUTGOING_CALLS and DISALLOW_SMS together.

Change-Id: I06dd23b3fb4a21f3a22661da17491fc5b0bce4ed
2014-07-17 11:03:41 -07:00
Amith Yamasani
51c6dac50e Multiuser settings revamp - followup to address comments
Bug: 15761405
Change-Id: I9c03432a2f2651a931486ce65fb3b5af37608be0
2014-07-10 00:39:10 +05:30
Amith Yamasani
9e6ac3d25f Multiuser settings revamp for L, first pass
Include Guest settings
Ability to switch users from Settings
Manage user settings like telephony access

Bug: 15761405
Change-Id: I2cfdc7bc2703ed202aa8bf1261c304c51ce48b29
2014-07-01 13:19:35 +05:30
Julia Reynolds
253b111a3d Merge "Remove PIN from users page - use disallow_add/remove_user restrictions." 2014-06-10 21:38:43 +00:00
Julia Reynolds
b9195d25ee Remove PIN from users page - use disallow_add/remove_user restrictions.
Bug: 14081992
Change-Id: If4973d64ae54da602a2682dee5b868ff66273856
2014-06-11 17:14:14 -04:00
Alan Viverette
6bfec2d6b1 Remove all dialog icons in Settings
BUG: 15474733
Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
2014-06-10 13:41:07 -07:00
Amith Yamasani
4093e40e18 Show user management UI if a managed profile exists
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
2014-06-06 14:31:37 -07:00
Amith Yamasani
0e43d324af Don't allow restricted profile creation for corp/edu owned devices
Bug: 14613459
Change-Id: I64dfba35418def8ae8793d7371b8960f5ff5946f
2014-05-09 13:43:43 -07:00
Alexandra Gherghina
312c4573c3 Switch to using the new enabled flag in UserInfo
Bug: 14377459
Change-Id: Ief309477d964f1158087240ce24030335652d6a7
2014-05-01 11:51:24 +01:00
Alexandra Gherghina
9a1baec5a3 Disable profile enabled check (API is changing)
Bug: 14377459
Change-Id: Ie79db95bcc5c7e3a95b479832dceaf628ae36728
2014-04-28 14:11:35 +01:00
Alexandra Gherghina
423bafccbc Revert "Revert "Wiring for displaying managed profiles""
This reverts commit 91e3f72569.

Will wait until related commit is in to submit this.

Bug: 13756871
Change-Id: I34642998adb71f44de1e529cc214ac4f921932ed
2014-04-24 18:06:06 +01:00
Alexandra Gherghina
91e3f72569 Revert "Wiring for displaying managed profiles"
This reverts commit a044235272.

This depended on CL: https://googleplex-android-review.googlesource.com/#/q/I2907b182e19b3562592da688b3f68ef5f4088557 which was not commited yet.

Bug: 13756871
Change-Id: Ib05c58002a06c7882c4b6dfd750c9681ff4b1646
2014-04-23 10:55:41 +00:00
Alexandra Gherghina
a044235272 Wiring for displaying managed profiles
Bug: 13756871
Change-Id: I81898e3b32baa0bc9ec72258b3bd470102d42b68
2014-04-15 14:54:01 +01:00
Fabrice Di Meglio
7f111811e0 Fix bug #13758772 Crash when hitting back after clicking on add a restricted...
... profile under Users

- no need to show the dialog again when we have pressed on BACK

Change-Id: I76f155a488512689c5af40ff35b80ce034da4ffe
2014-04-04 11:35:55 -07:00
Amith Yamasani
cfb8d7f3c8 Don't allow user creation on phones via Settings search
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
2014-03-26 14:46:47 -07:00
Tom O'Neill
dad115e2db Remove some usages of deprecated location APIs
Bug: 13302202
Change-Id: I916568d2b310eaf9a8b30da9a9980344aaf76c21
2014-03-05 09:31:09 -08:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- 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
2014-02-03 16:36:46 -08:00
Amith Yamasani
38e7610512 Exit restrictions fragment if user was deleted
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
2013-10-03 16:08:56 -07:00
Amith Yamasani
7f5f0bb2ae Don't crash on rotation when cropping a profile picture
Bug: 8910780

Keep track of pending activity result and avoid deleting the intermediate file.

Change-Id: I56f63e1348c8b1f5229ad3e135016b8b75d3a335
2013-09-13 12:12:08 -07:00
Amith Yamasani
2ad9625462 Fix profile picture picking for restricted profiles
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
2013-09-10 17:16:12 -07:00
Maggie Benthall
4453496448 Fixes for pin-restricted settings.
- 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
2013-08-29 18:06:13 -04:00
Amith Yamasani
cb6ba728c5 Merge "Don't list apps that are disabled by the system" into klp-dev 2013-08-27 21:42:58 +00:00
Amith Yamasani
d760a61936 Fix custom restrictions launch mechanism
Instead of showing a separate entry for launching custom restrictions,
launch it directly when clicking on the settings icon.

Bug: 10388399
Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
2013-08-20 16:26:48 -07:00
Amith Yamasani
928191881d Don't list apps that are disabled by the system
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
2013-08-16 13:59:40 -07:00
Geoffrey Borggaard
8a181dd0d1 Merge "Pin protect more screens." 2013-08-06 22:03:44 +00:00
Geoffrey Borggaard
fe21d9aaa8 Pin protect more screens.
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
2013-08-06 17:24:37 -04:00
Amith Yamasani
0aa1dc70c5 Remove Restrictions UI
Bug: 10200097
Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30
2013-08-06 10:46:51 -07:00
Amith Yamasani
d5b1a291eb Don't show Restrictions item if it has been disabled for the user.
Also don't show actual Restrictions content if the fragment was launched
through a different entry point.

Change-Id: I70cb76ca6f68a382e68219053e6f69e7f1fa0150
2013-07-22 16:51:39 -07:00
Amith Yamasani
a28787a1cb Remove spurious import
Change-Id: I91172626f4ec64c0fc7497f9f7d11244ca49a341
2013-07-19 13:21:35 -07:00
Amith Yamasani
7eedcf4a50 Apply restrictions right away instead of on exit
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
2013-07-18 11:37:32 -07:00