Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,834 Commits 1 Branch 0 Tags
181b63ebe09e2ef24bc1d2ad96d79e383525ed02
Commit Graph

211 Commits

Author SHA1 Message Date
Maria Garcia Puyol
c35b08b4b3 Merge "Revert "Dialog for emergency info"" into nyc-dev 2016-03-18 15:06:02 +00:00
Maria Garcia Puyol
da497f26d7 Revert "Dialog for emergency info" 
This reverts commit ae49edbdfd.

Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1
 2016-03-17 22:52:44 +00:00
Sudheer Shanka
f6c5128763 Merge "Update user capabilities in onResume." into nyc-dev 2016-03-15 23:32:26 +00:00
Sudheer Shanka
aa524ae581 Update user capabilities in onResume. 
Bug: 27641648
Change-Id: I85a6362a20885defa450760a3fbb16e124630434
 2016-03-14 17:23:13 -07:00
mariagpuyol
ae49edbdfd Dialog for emergency info 
Bug:27621394
Change-Id: I894f5526d05c84eec81e9fe87a105f466195073d
 2016-03-11 21:06:23 -08:00
Fyodor Kupolov
8c9120b9cc First time populate user list in onCreate 
Call updateUserList from onCreate instead of onResume during initialization.
This will suppress unnecessary animations.

Bug: 27527929

Change-Id: Ia420f41894b2033fb7f02de01168ccd2c6331588
 2016-03-07 13:08:49 -08:00
Fyodor Kupolov
39b900bd0c Merge "Use the right userId when setting restrictions" into nyc-dev 2016-03-04 02:20:49 +00:00
Fyodor Kupolov
779e47a5eb Use the right userId when setting restrictions 
Bug: 27457164
Change-Id: I9528b637cb0bc3f737458e078725f73666bd0d7d
 2016-03-03 18:14:50 -08:00
Sudheer Shanka
a59635100f Update custom widget layouts to have a restricted icon. 
Bug: 25603665
Bug: 27263775
Change-Id: Ic80377229de977b6f7c5f653974e8f926fb8ac1d
 2016-03-01 17:28:57 -08:00
Fyodor Kupolov
52ae05314d Do not allow removing current user if it's in a call 
Bug: 20652663
Change-Id: I2eb91bc73259e25b3fa68337df2a0576a438244a
 2016-02-24 15:56:13 -08:00
Sudheer Shanka
5d8e963c83 Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev 2016-02-19 19:31:45 +00:00
Sudheer Shanka
29737ad910 Part2 - Don't add padlock if the restriction is not set by admin. 
Bug: 26687435
Change-Id: I85ef42e1ff1216791d1393a975e8559191b3781f
 2016-02-19 19:24:34 +00:00
mariagpuyol
fe19bc3d4b Show emergency info preference for all users 
Change-Id: I8bfcedb8a15c9ca0194f5f526dd288857c19a1de
 2016-02-18 10:27:41 -08:00
Fyodor Kupolov
889bc3de82 Remove switching from Users menu 
Bug: 26562786
Change-Id: Id0f26621b8356c3161dee861b0215b01d48007c9
 2016-02-16 13:38:34 -08:00
Sudheer Shanka
9e9e63b7b3 Part3 - Don't add padlock if the restriction is not set by admin. 
Bug: 26687435
Change-Id: Ibfea6d7d5bd32e7a05dcc2cc32b121c9e50b6a34
 2016-02-16 11:04:11 +00:00
mariagpuyol
60435fc81d Add Emergency Info preference to user settings 
Bug: 26831671
Change-Id: I345fc9b9a54991de35c657e05cf3f08f21445f4c
 2016-01-28 15:04:32 -08:00
Daniel Sandler
ba9b20dae0 Merge "Revert "Add Emergency Info preference to user settings"" 2016-01-28 14:24:14 +00:00
Daniel Sandler
0def4c45b2 Revert "Add Emergency Info preference to user settings" 
This reverts commit 0401388028.

Bug: 26831671
Change-Id: Ibe5ae3c7da400efb389f905b1111f029b6a8bfaf
 2016-01-28 03:30:08 +00:00
Chris Wren
9d1bfd1e8d port settings over to new metrics enum 
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
 2016-01-27 10:58:58 -05:00
Maria Garcia Puyol
4ec12f7703 Merge "Add Emergency Info preference to user settings" 2016-01-26 19:00:51 +00:00
mariagpuyol
0401388028 Add Emergency Info preference to user settings 
Bug: 23591361
Change-Id: I514cfcf79aef091483c5826414b0317b581cb055
 2016-01-26 10:58:10 -08:00
Sudheer Shanka
ba1a68b8ab Add preference summary when disabled by admin. 
Change-Id: Iaa84e66b0abe0fccde50f116cbf6e68c6abbabc0
 2016-01-25 22:39:34 +00:00
Oleksandr Peletskyi
239e8a895f Merge "Added check of the restriction if a user is allowed to change their icon. BUG: 25305966" 2016-01-22 20:31:41 +00:00
Oleksandr Peletskyi
ef1584312b Added check of the restriction if a user is allowed to change their icon. 
BUG: 25305966

Change-Id: I35fda2e4f157463d69a109409c3f8767d54eab4a
 2016-01-22 11:57:44 +01:00
Sudheer Shanka
682a916836 Add padlocks to preferences that can be disabled by policy. 
Change-Id: I43b6b5954ef6ec65b86d99321cabab9f49df842d
 2016-01-20 17:48:27 +00:00
Tony Mantler
bd99c43887 Merge "Move a bunch of app restrictions logic to SettingsLib" 2016-01-12 17:17:04 +00:00
Makoto Onuki
d669fee6fb Remove fixed TODO (Settings) 
Change-Id: Ia4477acffb6209e5d3103367e69dbc789399cd9e
 2016-01-11 15:36:52 -08:00
Tony Mantler
06add5c5c3 Move a bunch of app restrictions logic to SettingsLib 
Change-Id: I54106d1175ba8bff8586c8c4dcef87e51fd1483b
 2016-01-11 13:39:36 -08:00
Kenny Guy
e526cf20bb Merge "Add support messages to device admin pages." 2016-01-06 19:55:35 +00:00
Kenny Guy
7a3555961d Add support messages to device admin pages. 
Add support message to device admin settings pages.
Show policy information for device owners
and profile owners.
Allow a user to remove profile from profile owners
admin page.

Bug: 26416662
Change-Id: I95424da50067b7c0ba1618a083a31448d406188f
 2016-01-06 17:21:45 +00:00
Fyodor Kupolov
8ba52d62ed Added lock screen settings section 
Added lock screen settings section and moved "Add users when device is locked"
 from the overflow menu to the new section.

Bug: 25289622
Change-Id: I97c02acbacae3b6cde44180a23ea337853b0a551
 2016-01-05 14:30:03 -08:00
Fyodor Kupolov
37d018e54b Use the right userId when setting guest restrictions 
Bug: 25977335
Change-Id: I5e58fc2d07d111d084dd33bc1fd5514b9bb6ff10
 2015-12-02 18:33:43 -08:00
Jason Monk
9d80eeabe7 Add some more summaries for Settings Home 
Change-Id: Iaca8db6bdce87e667832b5b670e4eb027580b668
 2015-11-30 10:57:33 -05:00
Makoto Onuki
4cfe39f539 Use explicit APIs to get device owner information 
Bug 24676413

Change-Id: Id346c2f01658173c9671edcfd34bc33f1b25faa4
 2015-11-24 14:55:26 -08:00
Makoto Onuki
c1a86f1de0 Merge "Do not use UM.setUserRestrictions() in Settings" 2015-10-26 21:37:08 +00:00
Makoto Onuki
b761ad1c6e Do not use UM.setUserRestrictions() in Settings 
Change-Id: I014fe939f3495521a813eadbb7353956afc3feb4
 2015-10-26 14:35:44 -07:00
Jason Monk
39b467482d Depend on support lib preferences 
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
 2015-10-13 10:12:20 -04:00
Fyodor Kupolov
1f432586b3 Moved restricted profile setup logic to UserManagerService 
Bug: 24212155
Change-Id: Iea214877dd856e830a42467780b7407b8991c52d
 2015-09-28 10:03:35 -07:00
Bart Sears
fbd126e423 Revert "Moved restricted profile setup logic to UserManagerService" 
This reverts commit 151dffcd64.

Change-Id: If98fddcfc8f46c77e3491f7a9fc918ed3752a0e8
 2015-09-26 02:00:46 +00:00
Fyodor Kupolov
151dffcd64 Moved restricted profile setup logic to UserManagerService 
Bug: 24212155
Change-Id: Ifd19cf5833fb8f2d61cfd6d0019849aa27701c38
 2015-09-24 12:59:34 -07:00
Fyodor Kupolov
9938f6fa45 Use createRestrictedProfile method to create profile 
Bug: 23191995
Change-Id: I83d900b274563dc964fd07dbd0fccbdb4b275f29
 2015-08-28 17:02:21 -07:00
Wei Liu
9dde0669f2 am 656c805b: am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib. 
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
 2015-08-25 18:45:34 +00:00
Wei Liu
6e58d516f0 Refactor UidDetailProvider and its dependencies to SettingsLib. 
so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
 2015-08-25 11:02:59 -07:00
Julia Reynolds
d7faba5c25 Add null check when loading restricted profile apps. 
In case the profile is being deleted.
Bug: 22235449

Change-Id: Ia67deb4e578edf79079ddc308b0750327c1ff85d
 2015-08-17 13:09:47 -04:00
Julia Reynolds
32f1fe5b8a Allow admins to remove users. 
(Instead of only letting non-admins do that)

Bug: 23220408
Change-Id: Ia27906eba9217fae104f24d227920782e1a27c5f
 2015-08-14 16:13:10 -04:00
Xiaohui Chen
44879a387a sys user split: first pass updating Settings 
Update various places in Settings to use "admin" ueser flag
instead of checking user id "0".  This should be no-op in
single user mode since the only admin user would be user 0.
In split system user mode, this will correctly ACL admin
user instead of non-interactive system user.

Bug: 19913735
Change-Id: Ida4d59c5f689ea0dc34b3b3ff0822b087fa0afd6
 2015-07-27 15:39:28 -07:00
Xiaohui Chen
8ae4680977 sys user split: update createUser method 
After the system user is split out, all users are more or less the same.
We combine the generic user and secondary user create method to reflect
this concept.  This also fixes the bug the newly created Primary user
from lock screen contains secondary user restrictions.

Bug: 19913735
Change-Id: I407a877c11346409bad85e00038f6cfd3d126da3
 2015-07-16 14:34:00 -07:00
Xiaohui Chen
148ef7795d sys user split: fix user settings user list 
Only end user switchable users should show up in this list.

BUG:19913735
Change-Id: Ifb83f159864f2210d779b5831c5a5c4dc5e6f4bb
 2015-07-16 10:09:37 -07:00
Xiaohui Chen
64f530c2f1 sys user split: refactor user settings 
BUG:19913735
Change-Id: I11e0c728d45bd74b60db89f352b356e97b755651
 2015-07-09 15:31:39 -07:00
Fyodor Kupolov
c478885d8d Guest option should not be shown for the guest user 
Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
 2015-06-09 15:55:01 -07:00