PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,140 Commits 1 Branch 0 Tags
fa3eea59e807ad2ed110e387f9257130aa9b4458
Commit Graph

6140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
fa3eea59e8 Only enable multi-user settings if a secure settings flag is set 
Use a secure settings key of "multiuser_enabled" that can be
set to "1" to enable the multiuser panel in Settings.

Change-Id: I37d96f6055bc7f87ef271ebdc58f16e7dcecca7b
 2012-03-28 10:25:08 -07:00
Amith Yamasani
7313fcd05e Merge "User management screens" 2012-03-27 14:29:58 -07:00
Amith Yamasani
b810a0ddf9 User management screens 
Customized Settings for restricted users
- Only some top-level settings panels available

User management
- Primary user can add and remove users
- User details screen to change name and list of enabled apps

Change-Id: Ia6beb991b427197a4ec2724ca3c9222073f6cf7d
 2012-03-27 12:06:29 -07:00
Eric Fischer
6f72c2066c am 819c7192: (-s ours) am c51c5310: Import translations. DO NOT MERGE 
* commit '819c7192845b211f912a22dea15c6114b12c25b1':
  Import translations. DO NOT MERGE
 2012-03-27 10:10:33 -07:00
Eric Fischer
5fecd4a02f am 412daa41: (-s ours) am f8b96014: Import translations. DO NOT MERGE 
* commit '412daa41d64cbdccccb8e885bbb5438b56dfff0b':
  Import translations. DO NOT MERGE
 2012-03-27 09:58:40 -07:00
Eric Fischer
819c719284 am c51c5310: Import translations. DO NOT MERGE 
* commit 'c51c5310dc04a4df34123b949d851563aa51d961':
  Import translations. DO NOT MERGE
 2012-03-26 14:22:09 -07:00
Eric Fischer
84ffca1812 Import translations. DO NOT MERGE 
Change-Id: Id7f71998a14b69452897c4b5f95992e550ad398b
 2012-03-26 14:10:26 -07:00
Eric Fischer
c51c5310dc Import translations. DO NOT MERGE 
Change-Id: I674045ccf2f0aeff64b0b32daa9ac4ecf1454896
 2012-03-26 14:08:37 -07:00
Eric Fischer
412daa41d6 am f8b96014: Import translations. DO NOT MERGE 
* commit 'f8b9601433b3f1be95f5e17ee7d2b20a19ddd590':
  Import translations. DO NOT MERGE
 2012-03-23 15:51:44 -07:00
Eric Fischer
7014dbca85 Merge "Import translations. DO NOT MERGE" 2012-03-23 15:48:34 -07:00
Eric Fischer
b4dbd796f6 Import translations. DO NOT MERGE 
Change-Id: I0b7fe9a5cbf8d45032a58f406f56a98436259a5e
 2012-03-23 13:51:40 -07:00
Eric Fischer
f8b9601433 Import translations. DO NOT MERGE 
Change-Id: I1b049b8739f288f0591959dc09dbfd43cc7c14d8
 2012-03-23 13:49:51 -07:00
Danielle Millett
790e0c3ef3 Fix 6101396: Added password check when turning biometric weak liveliness off 
Forcing the user to confirm their password when they turn liveliness off to
prevent a someone else besides the owner from turning it off.

Also renamed CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST to
CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST.

Change-Id: I4244c9a16340839b7cb7b4a1f9ca395db0c30eee
 2012-03-23 16:36:55 -04:00
Jeff Sharkey
5d108e4eb1 Merge "Cluster apps by user in Data Usage." 2012-03-22 11:13:57 -07:00
Jeff Sharkey
ef6e1ff728 Cluster apps by user in Data Usage. 
When displaying apps that have used data, cluster all app usage
together regardless of profile/user.  Always persist policy rules
using primary UID (the UID under the default user).

Bug: 6140462
Change-Id: Ia00bb42b26987553926f4027583dbe03b3bafba1
 2012-03-22 11:10:45 -07:00
Danielle Millett
e610246c21 Fixed the build: Put tablet version of string before default. 
Change-Id: I96d48bc82c5e61a6ac7ec04374caf58042fd49c0
 2012-03-22 11:46:19 -04:00
Danielle Millett
1fac8887e4 Merge "Added a liveliness check box preference for Face Unlock." 2012-03-22 07:48:32 -07:00
Mike Lockwood
5ccb2e1839 Merge "Merge remote-tracking branch 'goog/ics-aah-exp'" 2012-03-21 16:16:44 -07:00
Mike Lockwood
6c0b3bf4fd Merge "Merge commit '50339f3'" 2012-03-21 16:16:24 -07:00
Mike Lockwood
a9ee34ff30 Merge "Merge commit '3c7aec3'" 2012-03-21 16:16:07 -07:00
Mike Lockwood
802b98c0a1 Merge remote-tracking branch 'goog/ics-aah-exp' 2012-03-21 16:12:50 -07:00
Mike Lockwood
cd2fc47389 Merge commit '50339f3' 
turn off log spew

Change-Id: I1bd25f3954497557762fda0ebea64bc21031eef7
 2012-03-21 16:12:27 -07:00
Mike Lockwood
e7728d9adc Merge commit '3c7aec3' 
empty -s ours merge

Change-Id: I5f47de50b940f587b4339c13798ec5797f011d02
 2012-03-21 16:11:52 -07:00
Eric Fischer
8918dd6645 am 3ad5cadc: (-s ours) am 6db7e9e0: Import translations. DO NOT MERGE 
* commit '3ad5cadcbcee4b80906e7a526656791c66adb4d0':
  Import translations. DO NOT MERGE
 2012-03-21 15:34:21 -07:00
Eric Fischer
3ad5cadcbc am 6db7e9e0: Import translations. DO NOT MERGE 
* commit '6db7e9e04318e431c3afad68daaeac555dc71783':
  Import translations. DO NOT MERGE
 2012-03-21 14:19:35 -07:00
Eric Fischer
49a6bf9356 Import translations. DO NOT MERGE 
Change-Id: I12a6d9c821cdbe404d5962c998b357b35a976a29
 2012-03-21 13:35:52 -07:00
Eric Fischer
6db7e9e043 Import translations. DO NOT MERGE 
Change-Id: I50955bd54ef21ed5489958e92d33d5ca7efddc4f
 2012-03-21 13:34:02 -07:00
Eric Fischer
9cab5128a7 Import translations. DO NOT MERGE 
Change-Id: Id4ae315946f7c6f7c18ae263532a4cd42331ce29
 2012-03-21 13:32:40 -07:00
Danielle Millett
a87a25bdec Added a liveliness check box preference for Face Unlock. 
This will be used to enable or disable liveliness detection.

Change-Id: I0be735724aed4cadbd5c37d895a7f80ad4f4ee09
 2012-03-21 13:32:56 -04:00
Eric Fischer
439c551cf3 am 2c95ab5e: (-s ours) am 5665cda1: Import translations. DO NOT MERGE 
* commit '2c95ab5e48cfa5eeb31a394bd249d4eaf27493ea':
  Import translations. DO NOT MERGE
 2012-03-20 19:36:30 -07:00
Eric Fischer
7448daee66 am b22dff48: (-s ours) am 63cad3dd: Import translations. DO NOT MERGE 
* commit 'b22dff48f88068bb5ea1d4142267a029f34d5268':
  Import translations. DO NOT MERGE
 2012-03-20 19:36:03 -07:00
Jason Chen
2b5a7184a2 am 3f49e65f: (-s ours) am b0362b1b: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit '3f49e65fc3de05bfb2e54d74f8366c6be342d0b4':
 2012-03-20 19:35:39 -07:00
Jason Chen
84d6376872 am 9b06ca94: (-s ours) am 8f393645: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit '9b06ca9476e93f4a4e86b84d080df35a333dc0ac':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-20 18:20:37 -07:00
Jason Chen
686d1ee97a am 3180a46c: am 0eb3a3fc: am 23d0b528: Update string in Settings 
* commit '3180a46c4b2abaae0e9036b43dffee5884241b53':
 2012-03-20 17:55:14 -07:00
Jason Chen
36f00b36c6 am bb4133b1: am dd6c0d61: am 23d0b528: Update string in Settings 
* commit 'bb4133b1f6c88cb5cf0232ef5febe470f2665257':
  Update string in Settings
 2012-03-20 17:55:07 -07:00
Jeff Sharkey
9944314c2b Merge "Remember when NetworkPolicy was inferred." 2012-03-20 16:54:54 -07:00
Jeff Sharkey
012c16b62c Remember when NetworkPolicy was inferred. 
Change-Id: If2e8ba37fa166e1711650b87392af2ac3a418269
 2012-03-20 16:52:43 -07:00
Irfan Sheriff
5fe6069399 Merge "Add static ip/proxy support for hidden networks" 2012-03-20 14:42:03 -07:00
Eric Fischer
2c95ab5e48 am 5665cda1: Import translations. DO NOT MERGE 
* commit '5665cda1e1889af9bc7e48a0746f02cec3b17aef':
  Import translations. DO NOT MERGE
 2012-03-20 14:33:54 -07:00
Eric Fischer
50a802ebfd Import translations. DO NOT MERGE 
Change-Id: Ifb30e3e67756e441d76309f567d195c96bd7818d
 2012-03-20 13:03:30 -07:00
Eric Fischer
5665cda1e1 Import translations. DO NOT MERGE 
Change-Id: I0fdd1f06fb7783649795bac398e84c9be8658845
 2012-03-20 13:01:49 -07:00
Eric Fischer
67debdba9e Import translations. DO NOT MERGE 
Change-Id: I98dc979933a9a014f3a405fd88bb8823e7a2f83d
 2012-03-20 13:00:29 -07:00
Jeff Sharkey
eff40f4daf Merge "Enforcement control for READ_EXTERNAL permission." 2012-03-19 19:25:17 -07:00
Jeff Sharkey
11d3012c78 Enforcement control for READ_EXTERNAL permission. 
Surface enforcement controls for READ_EXTERNAL_STORAGE permission
using new PackageManager API.

Bug: 6131916
Change-Id: I0ece4742666fda58e41410cb4b0b7175f280fa31
 2012-03-19 17:23:01 -07:00
Irfan Sheriff
d61f7cd3aa Add static ip/proxy support for hidden networks 
Add support for static ip and proxy. In the process, clean up the issues
that showed up during testing.

Bug: 5459872
Change-Id: I96c8fff816b6cbb485d2bb215349193e49f3d0b2
 2012-03-19 16:05:49 -07:00
Eric Fischer
b22dff48f8 am 63cad3dd: Import translations. DO NOT MERGE 
* commit '63cad3dd8b06b0eff66be07815f1cfe54c5f7b76':
  Import translations. DO NOT MERGE
 2012-03-19 14:34:43 -07:00
Eric Fischer
04c60c9575 am bb43919b: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb43919bbbdf0ebe416f3388d734a2d60e00ea21':
  Import translations. DO NOT MERGE
 2012-03-19 14:32:40 -07:00
Eric Fischer
384e9157f7 Import translations. DO NOT MERGE 
Change-Id: I6d24d5dbde0bc089aa7e605f40ee902a42cb10b6
 2012-03-19 14:32:26 -07:00
Eric Fischer
63cad3dd8b Import translations. DO NOT MERGE 
Change-Id: Ic36ea190bec85b32f7614ca2c329d6ff48f93d8a
 2012-03-19 14:30:38 -07:00
Eric Fischer
76a3696496 Import translations. DO NOT MERGE 
Change-Id: Ib14c978b6abf1ac248953e2f4b03c71222b58c96
 2012-03-19 14:29:16 -07:00