PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,066 Commits 1 Branch 0 Tags
377002fa1a7a69de48d2f655a75b20f290c9fb6c
Commit Graph

10066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
377002fa1a am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 
* commit '26aca80eb1813cfe69450383efd8442805b16da5':
  Follow changes to RestrictionEntry API
 2013-03-29 18:56:30 -07:00
Amith Yamasani
26aca80eb1 am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 
* commit 'a7ff2a2d22b43197a168655159612c96c90fa335':
  Follow changes to RestrictionEntry API
 2013-03-29 18:51:15 -07:00
Amith Yamasani
a7ff2a2d22 Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:48:38 +00:00
Amith Yamasani
6e4757f0a6 Follow changes to RestrictionEntry API 
Implement custom restrictions activity.
Fixed some bugs.

Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857
 2013-03-29 18:40:45 -07:00
Kenny Root
419b49882a am 47704d08: am 43366b2c: Merge "Add KeyStore storage type to Settings UI" 
* commit '47704d08b8756d78d426100b97a4fa81b81f12b3':
  Add KeyStore storage type to Settings UI
 2013-03-29 16:46:39 -07:00
Kenny Root
47704d08b8 am 43366b2c: Merge "Add KeyStore storage type to Settings UI" 
* commit '43366b2c546045f3b554427bc6e97a6b529ab66a':
  Add KeyStore storage type to Settings UI
 2013-03-29 16:45:15 -07:00
Kenny Root
265398ecb3 am ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev 
* commit 'ab6a6645b01312816fe0688c76b5a26948252850':
  Add KeyStore storage type to Settings UI
 2013-03-29 14:36:30 -07:00
Fabrice Di Meglio
a8a4373a09 am fee612df: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 
* commit 'fee612df197ab3da969dff39ecc3df95b931cfae':
  Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
 2013-03-29 14:36:01 -07:00
Irfan Sheriff
016a391ad7 am 0f41b49d: Add install support for WIFI UID 
* commit '0f41b49d1f33e86ec4e7004f009c074b68a90be6':
  Add install support for WIFI UID
 2013-03-29 14:35:32 -07:00
Kenny Root
ab6a6645b0 Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev 2013-03-29 21:24:48 +00:00
Kenny Root
028634b6af Add KeyStore storage type to Settings UI 
Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.

(cherry picked from commit 39b56008be)

Change-Id: Id89a1e210b3627914f080b0925bd0d0585872dd2
 2013-03-29 14:23:30 -07:00
Kenny Root
43366b2c54 Merge "Add KeyStore storage type to Settings UI" 2013-03-29 21:09:47 +00:00
Fabrice Di Meglio
fee612df19 Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev 2013-03-29 19:41:13 +00:00
Kenny Root
39b56008be Add KeyStore storage type to Settings UI 
Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.

Change-Id: Ic970fb908989662665bf1af968ca4a6a9dbfb55a
 2013-03-29 11:48:55 -07:00
Irfan Sheriff
0f41b49d1f Add install support for WIFI UID 
Bug: 8472221
Change-Id: If203760fc960b4d8987d745e49ef1d4355c45adf
 2013-03-29 11:40:16 -07:00
Fabrice Di Meglio
96d780ddf6 Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode 
- title should be "viewStart"
- link speed should be also "viewStart"

Change-Id: Ic0389a1e4ddf1b1d6fc1fcbeba50074434fdb52d
 2013-03-28 20:26:24 -07:00
Eric Laurent
62143dab23 am 899e4f27: Merge "Display vibrate icon in volume menu" into jb-mr2-dev 
* commit '899e4f27f1866acee29c67e6f19b50308a3b12c3':
  Display vibrate icon in volume menu
 2013-03-28 15:32:55 -07:00
Eric Laurent
899e4f27f1 Merge "Display vibrate icon in volume menu" into jb-mr2-dev 2013-03-28 22:27:45 +00:00
Kenny Root
b9d0a35ea1 am a8645309: am 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other UID" 
* commit 'a86453096979d027d65390f657568c945fea1b3d':
  Add ability to install credentials as other UID
 2013-03-28 14:36:37 -07:00
Kenny Root
a864530969 am 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other UID" 
* commit '0d52fc184defef46378e7ba095091c7bab1ee459':
  Add ability to install credentials as other UID
 2013-03-28 14:32:50 -07:00
Kenny Root
0d52fc184d am 9dc478ec: Merge "Add ability to install credentials as other UID" 
* commit '9dc478ec23944e9b008ab559e2f1360a9e4818b4':
  Add ability to install credentials as other UID
 2013-03-28 14:30:37 -07:00
Kenny Root
9dc478ec23 Merge "Add ability to install credentials as other UID" 2013-03-28 20:57:04 +00:00
Maggie Benthall
38fa64a7a5 am 02e8ca3e: Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev 
* commit '02e8ca3e9ad966bd523241aaa1eecf58865027a8':
  Respect user restrictions about adding/removing accounts, sideloading
 2013-03-28 12:20:07 -07:00
Maggie Benthall
02e8ca3e9a Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev 2013-03-28 19:17:14 +00:00
Kenny Root
7422474c72 Add ability to install credentials as other UID 
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0
 2013-03-28 11:35:24 -07:00
Maggie Benthall
0c5a401a58 Respect user restrictions about adding/removing accounts, sideloading 
Hide or disable options in the settings app when the user is restricted from
making changes.

Remove "Add account" button from Settings menu, and "remove account" option from menu in AccountSyncSettings.
Remove sideloading checkbox in SecuritySettings.

Also handle replacement of UserManager.isShareLocationToggleAllowed() with hasUserRestriction, which takes a restriction key string.

Change-Id: I34c74fd5aed8956ba00f92e3d3c657b608454dfe
 2013-03-27 18:12:44 -04:00
Amith Yamasani
07aa7b8e18 am 0fb0d016: Merge "Split User settings into limited and trusted." into jb-mr2-dev 
* commit '0fb0d016dd51b0d8b882d92de58f5c2ea28a9208':
  Split User settings into limited and trusted.
 2013-03-27 12:36:52 -07:00
Amith Yamasani
0fb0d016dd Merge "Split User settings into limited and trusted." into jb-mr2-dev 2013-03-27 19:30:55 +00:00
Amith Yamasani
864e3b7c51 Split User settings into limited and trusted. 
Also show avatars with the circular frame like on lockscreen.

Change-Id: I032d842555b2f50a07166460f9cfb1963366dbb1
 2013-03-27 12:27:01 -07:00
Baligh Uddin
03be9690cf am c5a36d90: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'c5a36d903beb7929691b925d8b59664372e6d393':
  Import translations. DO NOT MERGE
 2013-03-27 10:46:38 -07:00
Baligh Uddin
5a471cfd2c Merge "Import translations. DO NOT MERGE" 2013-03-27 17:42:47 +00:00
Baligh Uddin
c5a36d903b Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-27 17:41:56 +00:00
Baligh Uddin
49182a26e7 Import translations. DO NOT MERGE 
Change-Id: I4cdb85276f2ff6e50f4978eaad3481a248a52fcb
Auto-generated-cl: translation import
 2013-03-27 10:41:39 -07:00
Baligh Uddin
3ba60dcb8e Import translations. DO NOT MERGE 
Change-Id: I7b83d0e661e36dfe47e342bf9e6086099c4b6be9
Auto-generated-cl: translation import
 2013-03-27 10:38:59 -07:00
Jeff Sharkey
984415cc96 am f7ad8e39: Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev 
* commit 'f7ad8e39748087e4e33a511d1c439b72ebd979b9':
  Fix padding so TextViews are baseline aligned.
 2013-03-27 09:51:27 -07:00
Jeff Sharkey
f7ad8e3974 Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev 2013-03-27 16:46:33 +00:00
Jeff Sharkey
ca60dc7fcd Fix padding so TextViews are baseline aligned. 
Also removed unused layout.

Change-Id: I1dd69c3766a58d389fb2fadcf04b23210af3d00a
 2013-03-27 09:46:06 -07:00
Irfan Sheriff
1e1baa824b am 05d67f62: Merge "Allow wildcard for bypass proxy" into jb-mr2-dev 
* commit '05d67f62b7370b3bbe3bf691ae01b8a46dd04606':
  Allow wildcard for bypass proxy
 2013-03-26 15:44:43 -07:00
Irfan Sheriff
05d67f62b7 Merge "Allow wildcard for bypass proxy" into jb-mr2-dev 2013-03-26 22:41:17 +00:00
Amith Yamasani
f1c9b70801 am 86ecd3c4: Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev 
* commit '86ecd3c437be3478ee17347df46ae53af0eef5ba':
  Device Admin Settings changes for Device Owner
 2013-03-26 15:31:35 -07:00
Amith Yamasani
86ecd3c437 Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev 2013-03-26 22:27:29 +00:00
Irfan Sheriff
b7cb3744da Allow wildcard for bypass proxy 
Allow *.example.com to be bypassed

Bug: 7422561
Change-Id: Ia7bd2d5b0a19794ae3bcccb8d6b78aeb2ba9c5fb
 2013-03-26 15:08:52 -07:00
Irfan Sheriff
54d4aefe0f am 61c30fe2: Merge "Fix monkey crash" into jb-mr2-dev 
* commit '61c30fe2d14573378321d3a8df21ffb14a54e43b':
  Fix monkey crash
 2013-03-26 14:26:06 -07:00
Irfan Sheriff
61c30fe2d1 Merge "Fix monkey crash" into jb-mr2-dev 2013-03-26 21:17:55 +00:00
Irfan Sheriff
ca8e9cd383 Fix monkey crash 
Bug: 8011964
Change-Id: Idafdb7b3bc22d3280e0aa93877b7e09a23270149
 2013-03-26 14:11:36 -07:00
Amith Yamasani
f3f7c1dfb7 Device Admin Settings changes for Device Owner 
Disable the list entry for an active device owner, as it can't be deactivated.

Change-Id: I833561f91ae60dff8226f9118c9e3b012e5e194f
 2013-03-26 13:07:25 -07:00
Eric Laurent
2c2bf97dd4 Display vibrate icon in volume menu 
When a tablet is in vibrate mode, the notification
volume icon in the volume menu should be vibrate
and not silent.

Bug 7235006

Change-Id: I460a579a7796f8fb2cac8ff581a98f23e57d1bb0
 2013-03-25 18:43:39 -07:00
Jeff Sharkey
551dd1f8ae am c64fad39: Merge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev 
* commit 'c64fad3917c7dc421cf541a1d5fb11ab77b24ca0':
  Fix Data Usage restrict logic, scrolling.
 2013-03-25 23:19:57 +00:00
Jeff Sharkey
c64fad3917 Merge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev 2013-03-25 23:13:22 +00:00
Jeff Sharkey
92b518c9aa Fix Data Usage restrict logic, scrolling. 
Bug: 8141491
Change-Id: I4e94666c59d91fb112477781ab340fd25d03de27
 2013-03-25 16:13:00 -07:00