Kenny Root
d1e485a8fc
resolved conflicts for merge of 3a271718
to jb-mr2-dev-plus-aosp
...
Change-Id: If405c0e3ccff4029c2b54cf557d09c086485ab20
2013-04-08 12:06:29 -07:00
Kenny Root
56e75f3c17
am 645e78d8
: Merge "Allow multiuser use of keystore" into jb-mr2-dev
...
* commit '645e78d8063169fa59b69bdc83ac5a62840d3253':
Allow multiuser use of keystore
2013-04-08 11:04:10 -07:00
Kenny Root
645e78d806
Merge "Allow multiuser use of keystore" into jb-mr2-dev
2013-04-08 17:58:37 +00:00
Kenny Root
c5550c2012
Allow multiuser use of keystore
...
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.
(cherry picked from commit cc48b0104e
)
Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
2013-04-08 10:36:05 -07:00
Kenny Root
3a27171881
Merge "Allow multiuser use of keystore"
2013-04-08 17:34:32 +00:00
Kenny Root
cc48b0104e
Allow multiuser use of keystore
...
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.
Bug: 7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
2013-04-08 10:23:38 -07:00
Daniel Sandler
afa0b2c5a8
am b8c4898c
: Fix "no notification listeners" text.
...
* commit 'b8c4898c64c6e1a0e3d0a1de7c0116d80edb6e44':
Fix "no notification listeners" text.
2013-04-08 09:12:38 -07:00
Daniel Sandler
b8c4898c64
Fix "no notification listeners" text.
...
Bug: 8454150
Change-Id: I6b02367e2be9f31fdf0a54d7fc0c49f8c82922d7
2013-04-08 12:01:33 -04:00
Nick Kralevich
4f9dc39a8a
am b26a61d6
: InstalledAppDetails: allow revocable permission.
...
* commit 'b26a61d6433e2e5456563e5d33aa4f419a8966fb':
InstalledAppDetails: allow revocable permission.
2013-04-07 10:56:54 -07:00
Nick Kralevich
b26a61d643
InstalledAppDetails: allow revocable permission.
...
Modify the Settings app so that a user can revoke permissions,
using the new API added in AppSecurityPermissions.
Bug: 8332307
Change-Id: I4d6c10877e2c3cc284dbf9a43f79697914c0b192
2013-04-05 18:39:15 -07:00
Daniel Sandler
3c3a3b7eb0
am 79b9bfe5
: Notification listeners can be enabled in Settings>Security.
...
* commit '79b9bfe56ee4036fbe8d9bcac01260356309ae2f':
Notification listeners can be enabled in Settings>Security.
2013-04-05 12:58:41 -07:00
Daniel Sandler
861b224281
am e44f5e2b
: Reference new StatusBarNotification and INotificationListener packages.
...
* commit 'e44f5e2bd6624f5df91e2676b1ef5e3ddf279066':
Reference new StatusBarNotification and INotificationListener packages.
2013-04-05 12:58:40 -07:00
Daniel Sandler
79b9bfe56e
Notification listeners can be enabled in Settings>Security.
...
Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.
Bug: 8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
2013-04-05 19:57:03 +00:00
Daniel Sandler
e44f5e2bd6
Reference new StatusBarNotification and INotificationListener packages.
...
Requires change I1be46f82 in f/b.
Bug: 8199624
Change-Id: I2ebf7fde793dd932c5fadb308f8a0b93e18d9afa
2013-04-05 19:55:12 +00:00
Baligh Uddin
c1f6219f76
am 34e85f84
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '34e85f841cf1022a1e709cc6288c68267d358e0b':
Import translations. DO NOT MERGE
2013-04-05 11:53:35 -07:00
Baligh Uddin
34e85f841c
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-05 18:48:15 +00:00
Baligh Uddin
92be13df55
Import translations. DO NOT MERGE
...
Change-Id: Ide4cc0e303747966dd29a5c849a2d9023b92e098
Auto-generated-cl: translation import
2013-04-05 11:07:06 -07:00
Kristian Monsen
3c6c45f931
am a95604de
: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
...
* commit 'a95604de1acd89999c240449e926485393963455':
Adding developer toggle for using Chromium WebView.
2013-04-05 10:46:44 -07:00
Kristian Monsen
a95604de1a
Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
2013-04-05 17:41:34 +00:00
Fabrice Di Meglio
66fe98823f
am e68959de
: Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
...
* commit 'e68959de3a7f2d47de4816b65262b10e03ef313c':
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-04-04 11:02:04 -07:00
Fabrice Di Meglio
e68959de3a
Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
2013-04-04 17:59:50 +00:00
Baligh Uddin
63627c20bd
am 186e250a
: Import translations. DO NOT MERGE
...
* commit '186e250ac7f74e8c724919184e949f7bf17afefb':
Import translations. DO NOT MERGE
2013-04-03 14:59:08 -07:00
Baligh Uddin
186e250ac7
Import translations. DO NOT MERGE
...
Change-Id: I5b8551dbf8daff54103023c68f8214b135dd07c1
Auto-generated-cl: translation import
2013-04-03 11:14:39 -07:00
Fabrice Di Meglio
f2a9717b93
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
...
- use setPaddingRelative() instead of setPadding()
- add missing android:textAlignment="viewStart"
Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
2013-04-02 18:36:43 -07:00
Robert Greenwalt
456eadd9fe
am 58f9cbd6
: Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
...
* commit '58f9cbd6774741d7fffbddbd06f2c0bf1fdf2e66':
pre-provide the mvno data of the edited apn
2013-04-02 12:25:17 -07:00
Robert Greenwalt
58f9cbd677
Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
2013-04-02 19:20:13 +00:00
Sungmin Choi
cd1cb16bad
pre-provide the mvno data of the edited apn
...
For mvno, user can add or edit mvno data field.
Pre-provide the mvno data of the edited apn when the user selects
one of the mvno types.
For example if user choose gid, populate the data field with the
current sim's gid1 data, or if user choose the SPN option, fill
in data with the current carrier string. If IMSI, fill in imsi data.
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
2013-04-01 16:44:15 -07:00
Baligh Uddin
0c4da3fa97
am 1c541aec
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1c541aec2be937f3ba6b1530551c16435d0eafc6':
Import translations. DO NOT MERGE
2013-04-01 12:39:36 -07:00
Baligh Uddin
1c541aec2b
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-01 19:37:24 +00:00
Maggie Benthall
e427ccdce3
am 8d9b07ed
: Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev
...
* commit '8d9b07edb1785983f60a317a6adbc6199f81788c':
When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
2013-04-01 11:52:50 -07:00
Maggie Benthall
8d9b07edb1
Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev
2013-04-01 18:50:30 +00:00
Amith Yamasani
52d9a78f22
am cb7b0b77
: Better app filtering for limited users
...
* commit 'cb7b0b77ae04a84c75611a98a583c81208575ba5':
Better app filtering for limited users
2013-03-31 22:44:14 -07:00
Amith Yamasani
cb7b0b77ae
Better app filtering for limited users
...
Show all system apps that have launchers and widgets.
Show all downloaded apps.
Remove dupes by package name.
Change-Id: Ief59b057e55a55e48ef48c5a638f6daf6a952e4e
2013-03-31 22:40:26 -07:00
Amith Yamasani
b19daff9cb
am 2601cd91
: Implement proper settings restrictions
...
* commit '2601cd9142bda1953c1e7b0302f7e0d0f02b0c1b':
Implement proper settings restrictions
2013-03-31 18:22:50 -07:00
Amith Yamasani
2601cd9142
Implement proper settings restrictions
...
Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.
Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
2013-03-31 18:20:36 -07:00
Amith Yamasani
fe44098dd1
am 732c80ff
: Remove Limited users category if empty
...
* commit '732c80ff18a0e0e0cd516e7ec007eda1574cd2de':
Remove Limited users category if empty
2013-03-29 20:31:22 -07:00
Amith Yamasani
732c80ff18
Remove Limited users category if empty
...
If there are no users under limited category, in a secondary user,
remove the subheading completely.
Change-Id: I0397b6198c8cfc147e9e7dc30a92a7cb2f5860e3
2013-03-29 20:28:28 -07:00
Baligh Uddin
494fd572cc
Import translations. DO NOT MERGE
...
Change-Id: I846ec473107cdeeb6573445d8faa60ab83fa6946
Auto-generated-cl: translation import
2013-03-29 19:41:06 -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
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
Maggie Benthall
6ad2e323f7
When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
...
Under Settings > Storage, remove the "USB computer connection" menu item.
In case someone launches the UsbSettings screen instead, also disable those checkboxes.
Change-Id: I59ec8b16bed4670beeac8d359e5368e4a659061b
2013-03-29 18:59:33 -04: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