Amith Yamasani
c077cd8dec
am d8b0d0ed
: Make sure Settings app restrictions show up
...
* commit 'd8b0d0ed8e12c1c3f5c44d50ddf3a69aa8a2be72':
Make sure Settings app restrictions show up
2013-04-11 13:52:50 -07:00
Amith Yamasani
d8b0d0ed8e
Make sure Settings app restrictions show up
...
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.
Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
2013-04-11 11:12:35 -07:00
The Android Open Source Project
d8a4eed488
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I18995b65eb42855a0e4559731b1c180ab12f34f5
2013-04-11 07:45:28 -07:00
Maggie Benthall
2def3df600
am 3c3fa0cc
: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
...
* commit '3c3fa0ccb8bf9f62558202e909cc158a2e673e37':
Implement Settings app UX for when a user has bluetooth config locked down.
2013-04-11 07:08:37 -07:00
Maggie Benthall
3c3fa0ccb8
Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
2013-04-11 14:04:40 +00:00
The Android Automerger
e41164e928
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:58 -07:00
Amith Yamasani
7805d74cd7
am d81a3f73
: Improve app list for limited users
...
* commit 'd81a3f73680372ba93a2a26a445d148220c1a521':
Improve app list for limited users
2013-04-10 22:13:09 -07:00
Amith Yamasani
d81a3f7368
Improve app list for limited users
...
Show all activities in the same package with a master/slave relationship,
toggling all when the master is toggled.
Don't show required apps that have no restrictions.
Show apps that are only installed on the target user.
Bug: 8520813 lowercase app names
Bug: 8520185 apps installed only in limited user
Bug: 8567000 strange behavior with apps that have two launcher icons
Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
2013-04-10 21:59:18 -07:00
Svetoslav
fce2148f3c
am 96cd9e7c
: First accessibility device disabled if enableing a second one is canceled.
...
* commit '96cd9e7cc7d830756f42aa715e0062f938d4ae55':
First accessibility device disabled if enableing a second one is canceled.
2013-04-10 17:56:25 -07:00
Svetoslav
96cd9e7cc7
First accessibility device disabled if enableing a second one is canceled.
...
The value whether accessibility should stay enabled was incorrectly
computed and as a result accessibility was disaabled when the second
accessibility service enabling is canceled.
bug:7716830
Change-Id: Ic23c24b1ffa90811e21210aeeca158568ad37904
2013-04-10 17:33:42 -07:00
Dianne Hackborn
5d46a54c55
am 8c94273c
: Merge "Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
...
* commit '8c94273c73480c35ee0af8910b32f0d4dec48132':
Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats
2013-04-10 14:16:34 -07:00
Dianne Hackborn
8c94273c73
Merge "Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
2013-04-10 21:14:22 +00:00
Baligh Uddin
8059d27e73
am fdc5489b
: Import translations. DO NOT MERGE
...
* commit 'fdc5489b56a0432b1b05fd2cc36d8b729d9fabf5':
Import translations. DO NOT MERGE
2013-04-10 13:00:33 -07:00
Dianne Hackborn
1d675e6546
Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats
...
Should be comparing with Bluetooth UID, not the wrong and broken GID.
Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
2013-04-10 12:50:32 -07:00
Baligh Uddin
fdc5489b56
Import translations. DO NOT MERGE
...
Change-Id: Ifb727fcd1cfd28e78a2f405ee5cbba21e1999ab3
Auto-generated-cl: translation import
2013-04-10 11:27:46 -07:00
The Android Open Source Project
122bfe4f04
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I5597c4b46c146b190370d63e0128d2d84f80888a
2013-04-10 10:06:01 -07:00
The Android Automerger
071d2cf06f
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-10 05:56:49 -07:00
Amith Yamasani
0c8f924643
am 80b1dfe4
: Merge "Select text in user name dialog" into jb-mr2-dev
...
* commit '80b1dfe46a85e3ecdbeca5575c205086e5ab07e0':
Select text in user name dialog
2013-04-09 17:30:51 -07:00
Amith Yamasani
80b1dfe46a
Merge "Select text in user name dialog" into jb-mr2-dev
2013-04-10 00:29:12 +00:00
Amith Yamasani
583757908b
Select text in user name dialog
...
Enables quickly changing the name without moving the cursor.
Also use cap words style.
Bug: 8518507
Change-Id: I6841cad221b56bb4c3d51c21d30b3858d1ee3e1c
2013-04-09 17:26:43 -07:00
Amith Yamasani
3727018a5a
Potential fix for a monkey-related NPE
...
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.
Bug: 8005271
Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
2013-04-09 16:05:16 -07:00
Wink Saville
9f5f4fdde6
am 460f2478
: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
...
* commit '460f24786a84106ec38e9209b2a943747deaf12c':
Add FW support for CellInfo RIL commands.
2013-04-09 15:57:23 -07:00
Wink Saville
460f24786a
Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
2013-04-09 22:50:41 +00:00
Baligh Uddin
4e30157fb2
am f0e09bf7
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f0e09bf702cb62abe6bd53d17e5dd2e9593cc3b0':
Import translations. DO NOT MERGE
2013-04-09 12:29:52 -07:00
Baligh Uddin
f0e09bf702
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-09 19:26:15 +00:00
Ben Murdoch
6fdc642e86
am f452008f
: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
...
* commit 'f452008f5b6bf57dca0b624c14a7f3cfa1ae8fdd':
Properly remove experimental WebView preference when unavailable.
2013-04-09 12:03:53 -07:00
Ben Murdoch
f452008f5b
Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
2013-04-09 19:00:41 +00:00
Jared Duke
9225bc538d
Properly remove experimental WebView preference when unavailable.
...
When the experimental WebView library is unavailable, properly remove it from
the appropriate preferences group.
Bug: 8572673
Change-Id: I34dd0720199c826ca12e0f991e2f6bd9c5ad35f3
2013-04-09 19:14:57 +01:00
Amith Yamasani
e9691ed5fb
am 0a970cae
: Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
...
* commit '0a970caed489fc10078eaad6796ee06832323bde':
Send app restrictions broadcast to stopped apps as well
2013-04-09 11:12:42 -07:00
Amith Yamasani
0a970caed4
Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
2013-04-09 18:09:40 +00:00
Amith Yamasani
872d4fba77
Send app restrictions broadcast to stopped apps as well
...
Otherwise the restrictions won't be shown for apps that haven't been
launched yet.
Bug: 8577600
Change-Id: I1d0d93553456dfedfb749e3d8262911af4362a80
2013-04-09 11:05:18 -07:00
Amith Yamasani
631285a43f
am 350938ec
: Potential fix for a monkey-related NPE
...
* commit '350938ecc69085badef2edc16491ff7a461dfb08':
Potential fix for a monkey-related NPE
2013-04-09 10:35:12 -07:00
Amith Yamasani
350938ecc6
Potential fix for a monkey-related NPE
...
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.
Bug: 8005271
Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
2013-04-09 10:25:43 -07:00
The Android Automerger
0e130741ea
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-09 05:56:08 -07:00
Wink Saville
bf4712895a
Add FW support for CellInfo RIL commands.
...
Add being able to setCellInfoListRate.
Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
2013-04-08 15:19:44 -07:00
The Android Open Source Project
54f1b92466
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I6f525da73cd808b3dd861d2df8b279c861041b02
2013-04-08 13:36:32 -07:00
Maggie Benthall
11b69bf86d
Implement Settings app UX for when a user has bluetooth config locked down.
...
When a user has the user restriction DISALLOW_CONFIG_BLUETOOTH
- Remove all the menu items for searching and other config
- Hide "available" but non-paired devices
- Remove settings button from paired devices
- Remove ability to make the device visible to others
Change-Id: Icaebf29d3cce55d924fdd65449447b5b7a438bbe
2013-04-08 16:05:38 -04:00
Baligh Uddin
1d4bbaef8c
Import translations. DO NOT MERGE
...
Change-Id: Ib3ac2b538aa44464e84db39d318f828b656eb759
Auto-generated-cl: translation import
2013-04-08 12:47:32 -07:00
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
The Android Automerger
2ecf44d6f8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:57:01 -07: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
8f511b1709
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 15:38:08 -07:00