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

6268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vikram Aggarwal
9f55ae2878 Fix crash due to lost activity. 
Change-Id: I9d0c2941bf3d725c506b15a738e6ab41678d76d1
 2012-04-02 13:36:35 -07:00
Eric Fischer
fe03081de3 am 5797c502: (-s ours) am ca0d6822: Import translations. DO NOT MERGE 
* commit '5797c5023f940b6518b24ddb7a76591c936899af':
  Import translations. DO NOT MERGE
 2012-03-30 20:05:19 -07:00
Eric Fischer
5797c5023f am ca0d6822: Import translations. DO NOT MERGE 
* commit 'ca0d6822f163d8478cbf02a11d5d136e0e3f25c3':
  Import translations. DO NOT MERGE
 2012-03-30 14:57:34 -07:00
Eric Fischer
e725821201 Merge "Import translations. DO NOT MERGE" 2012-03-30 14:53:20 -07:00
Svetoslav Ganov
427f3fe7d2 Merge "Changed text for "accessibility script injection" preference." 2012-03-30 14:24:14 -07:00
Eric Fischer
f5d3fa195e Import translations. DO NOT MERGE 
Change-Id: Iebffa3155bcaa07e35790b5f09f3a4c309ea4351
 2012-03-30 14:02:40 -07:00
Eric Fischer
ca0d6822f1 Import translations. DO NOT MERGE 
Change-Id: I6a07131c3025acbb574d3add8ead6f272fd0d942
 2012-03-30 14:00:32 -07:00
alanv
9d085307bb Changed text for "accessibility script injection" preference. 
Change-Id: I8afc786f47b88bde3212f38683c813771e70af6b
 2012-03-30 13:42:37 -07:00
Vikram Aggarwal
bfa3a64310 Minor changes to improve CryptKeeper readability 
Change-Id: I8a056216edf7f557c32bdec9387b0d31de7aa6c6
 2012-03-30 13:11:44 -07:00
Eric Fischer
8e871ad0e0 am f8512644: (-s ours) am 841ad7ba: Import translations. DO NOT MERGE 
* commit 'f85126443db3760a994edeb2cb595ff6de0e0a8f':
  Import translations. DO NOT MERGE
 2012-03-30 09:29:59 -07:00
Eric Fischer
f85126443d am 841ad7ba: Import translations. DO NOT MERGE 
* commit '841ad7ba7f71589f9ca976a5b5b8535e3458a810':
  Import translations. DO NOT MERGE
 2012-03-29 14:31:58 -07:00
Eric Fischer
da421562fd Import translations. DO NOT MERGE 
Change-Id: Iea14f3c10b2730b43740e4fa73eba834699c1c6c
 2012-03-29 14:15:02 -07:00
Eric Fischer
841ad7ba7f Import translations. DO NOT MERGE 
Change-Id: I5db9914730e86cd35b9098780e66c472c84aeadb
 2012-03-29 14:13:01 -07:00
Irfan Sheriff
93345aefa8 Merge "Fix discovery state tracking" 2012-03-29 08:41:25 -07:00
Amith Yamasani
9cc3e6fdd8 Merge "Only enable multi-user settings if a secure settings flag is set" 2012-03-28 16:12:59 -07:00
Irfan Sheriff
3a14bafcf6 Fix discovery state tracking 
Use the new intent to track if we are in discovery state

Change-Id: I9e07c3ccfcf62c3c33195d23c94de60d4248670c
 2012-03-28 15:55:20 -07:00
Eric Fischer
2eadb1f97e Import translations. DO NOT MERGE 
Change-Id: I50a666daa881741b7d5cbbb904ddd2d7c68e9771
 2012-03-28 13:44:40 -07:00
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
Kenny Root
d0c186dde0 Merge "Convert to new KeyStore format" 2012-03-27 20:41:49 -07:00
Kenny Root
66ada107ef Merge "Update Wifi to use new keystore function" 2012-03-27 20:41:40 -07:00
Kenny Root
8ce45a6ccc Merge "Switch VPN to use keystore ENGINE" 2012-03-27 20:41:34 -07:00
Eric Fischer
46a0389e07 am fe8b3e9a: (-s ours) am f4ce8c93: Import translations. DO NOT MERGE 
* commit 'fe8b3e9a6062411d9ce7c97c1499915e5afb9dfb':
  Import translations. DO NOT MERGE
 2012-03-27 16:33:37 -07:00
Eric Fischer
fe8b3e9a60 am f4ce8c93: Import translations. DO NOT MERGE 
* commit 'f4ce8c937ea54fbee1fe38f858fc065d78c57214':
  Import translations. DO NOT MERGE
 2012-03-27 16:31:31 -07:00
Eric Fischer
24ea6f0138 Merge "Import translations. DO NOT MERGE" 2012-03-27 16:30:54 -07:00
Amith Yamasani
7313fcd05e Merge "User management screens" 2012-03-27 14:29:58 -07:00
Eric Fischer
dc162cc333 Import translations. DO NOT MERGE 
Change-Id: I85c61b813ff4e4d9dd7cc1d2e3c49187b3d104d6
 2012-03-27 13:32:03 -07:00
Eric Fischer
f4ce8c937e Import translations. DO NOT MERGE 
Change-Id: I554653297cd9a1e29ce0daf1997874f33d1bb7e1
 2012-03-27 13:30:09 -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
Kenny Root
455a911df3 Switch VPN to use keystore ENGINE 
The VPN client will no longer receive the private key material directly
from the caller. Instead it will use the keystore OpenSSL ENGINE to
request that keystore does private key operations on its behalf.

We only pass the keystore key alias to the private key instead of the
private key itself now.

Change-Id: I4ea2abda5ab7dec7d7ef5f451b96fef5bc92d811
 2012-03-21 15:00:47 -07:00