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

6880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
4b60449653 merge in jb-release history after reset to master 2012-03-21 07:05:11 -07: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
The Android Automerger
577360515c merge in jb-release history after reset to master 2012-03-20 14:15:37 -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
The Android Automerger
5585eeaf92 merge in jb-release history after reset to master 2012-03-20 07:04:10 -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
The Android Automerger
dc02117230 merge in jb-release history after reset to master 2012-03-19 07:05: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
Jason Chen
800d263c2d am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:49 -07:00
Jason Chen
dd6c0d61d7 am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:17 -07:00
Jason Chen
0eb3a3fc4e am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:17 -07:00
Eric Fischer
d88d7daf1b Import translations. DO NOT MERGE 
Change-Id: I8d12690747947a87a4fdcc6aa1b8e9c641802bf5
 2012-03-16 14:11:46 -07:00
Jason Chen
23d0b5287a Update string in Settings 
Bug: 6183254

Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
 2012-03-16 11:31:19 -07:00
Jeff Sharkey
f5091acc8d Merge "Auto grid lines, lower minimum, disable estimates." 2012-03-15 18:41:26 -07:00
Jeff Sharkey
a8106f248c Auto grid lines, lower minimum, disable estimates. 
Show automatic grid lines with power-of-two spacing, avoiding ANR
when trying to render thousands of gridlines.  Lower minimum chart
height to 50MB to give better view of linear data.  Also disable
estimates rendering.

Bug: 5500204, 6005240
Change-Id: Iacfed11b32c0095c9c2d08bee6a1b5e29637de98
 2012-03-15 18:38:36 -07:00
Jeff Sharkey
4d28820b7e Merge "Avoid Data Usage AppDetailsFragment ISE." 2012-03-15 16:57:51 -07:00
Jeff Sharkey
3235ddb7aa Avoid Data Usage AppDetailsFragment ISE. 
Bug: 6022913
Change-Id: I4672b327096add4beeeb52f0bb467622b3467fcf
 2012-03-15 16:40:31 -07:00
Eric Fischer
5981e0ef09 Import translations. DO NOT MERGE 
Change-Id: Ic216c073a9621e953fb5ef6ed36ffdd59ad39660
 2012-03-15 14:36:44 -07:00
The Android Automerger
eb2ecf9004 merge in jb-release history after reset to master 2012-03-15 09:00:23 -07:00