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

6580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kenny Root
b50b15cdbe Convert to new KeyStore format 
keystore no longer stores private key material in the clear. It needs to
use an opaque handle for the private key material and then keystore will
sign the data on the requester's behalf instead of returning the key
material.

Change-Id: I836749769a8519cfc21bfdc2a3b3c8c1a01d8f05
 2012-03-21 14:57:29 -07:00
Kenny Root
4786b261d3 Update Wifi to use new keystore function 
The old wpa_supplicant.conf format used a special URI prefix
"keystore://" for the private_key value to indicate when to load things
from keystore.

The new format uses an OpenSSL ENGINE to perform operations with the
private key, so we don't need the special URI prefix.

Change-Id: I04751846f72b22eb5fc947bd7a32f47713e9fc82
 2012-03-21 14:52:16 -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
Eric Fischer
bb43919bbb Import translations. DO NOT MERGE 
Change-Id: Ie27bb5431e3356c30867fc25d00037b3b567da5c
 2012-03-19 14:28:34 -07:00
Jason Chen
3f49e65fc3 am b0362b1b: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'b0362b1bb0a3288c8de2cd8d0e5efd44ec1a831e':
 2012-03-16 17:29:35 -07:00
Jason Chen
9b06ca9476 am 8f393645: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit '8f393645e9b66235760c3e3c9b1dd9d999ed03f1':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 17:27:13 -07:00
Jason Chen
b0362b1bb0 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 17:26:29 -07:00
Jason Chen
d6c1c58af2 am 80f2b063: (-s ours) am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit '80f2b06330accf1e4f51bc4846edf1e1409899f1':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:35:56 -07:00
Jason Chen
80f2b06330 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:33:10 -07:00
Jason Chen
8f393645e9 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:32:30 -07:00
Jason Chen
d5f7e6cd6b [DO NOT MERGE] Revert "Update string in Settings" 
This reverts commit 23d0b5287a.
 2012-03-16 16:18:51 -07:00
Jason Chen
3180a46c4b am 0eb3a3fc: am 23d0b528: Update string in Settings 
* commit '0eb3a3fc4e25d4df6379d775269f561f66748c8d':
 2012-03-16 14:21:08 -07:00
Jason Chen
bb4133b1f6 am dd6c0d61: am 23d0b528: Update string in Settings 
* commit 'dd6c0d61d7a3c605be2d402c3cd2586c539df81c':
  Update string in Settings
 2012-03-16 14:19:03 -07:00