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
549857a8b4
am fce2148f
: am 96cd9e7c
: First accessibility device disabled if enableing a second one is canceled.
...
* commit 'fce2148f3c679ef12ee59a8dcf071e34cea100f5':
First accessibility device disabled if enableing a second one is canceled.
2013-04-10 18:22:49 -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
ab27d31a81
am 5d46a54c
: am 8c94273c
: Merge "Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
...
* commit '5d46a54c55a4e48332905bd927c24bc2544e2893':
Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats
2013-04-10 14:18:56 -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
2256dc2dfa
am 8059d27e
: am fdc5489b
: Import translations. DO NOT MERGE
...
* commit '8059d27e73e89fd207ddbd3688c28b0dade11d78':
Import translations. DO NOT MERGE
2013-04-10 13:03:31 -07: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
Baligh Uddin
6bb143a9be
Merge "Import translations. DO NOT MERGE"
2013-04-10 19:56:33 +00: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
8c37212d09
Import translations. DO NOT MERGE
...
Change-Id: Id2b91f9699560cd2f7a4858c9b96c8782a6a0601
Auto-generated-cl: translation import
2013-04-10 11:30:34 -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
b544e4f76d
am 122bfe4f
: Reconcile with jb-mr2-release - do not merge
...
* commit '122bfe4f0495c22f1c18e4d79d7d20c2f3795114':
Potential fix for a monkey-related NPE
2013-04-10 10:08:20 -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
fe4ac71404
merge in master-release history after reset to master
2013-04-10 07:51:07 -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
e2367654b6
am 0c8f9246
: am 80b1dfe4
: Merge "Select text in user name dialog" into jb-mr2-dev
...
* commit '0c8f9246437234a0de217feb339c5811012bea5c':
Select text in user name dialog
2013-04-09 17:33:13 -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
69e57fa7f3
am 9f5f4fdd
: am 460f2478
: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
...
* commit '9f5f4fdde61fabb634885e71f845d8d3c1fc9c7b':
Add FW support for CellInfo RIL commands.
2013-04-09 16:02:04 -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
2fc80bd076
am 4e30157f
: am f0e09bf7
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '4e30157fb22bcdc16ea61f3b137ced17dd35b333':
Import translations. DO NOT MERGE
2013-04-09 14:25:26 -07:00
Ben Murdoch
9f8c61ee1a
am 6fdc642e
: am f452008f
: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
...
* commit '6fdc642e8640927bee97f93812a58897afa252e9':
Properly remove experimental WebView preference when unavailable.
2013-04-09 14:25:22 -07:00
Amith Yamasani
dfead4eb31
am e9691ed5
: am 0a970cae
: Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
...
* commit 'e9691ed5fb51b58dc4b144fec4226e6353f8df93':
Send app restrictions broadcast to stopped apps as well
2013-04-09 14:25:16 -07: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
87f4c1d5be
Merge "Import translations. DO NOT MERGE"
2013-04-09 19:26:26 +00: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
66ab414ea8
am 631285a4
: am 350938ec
: Potential fix for a monkey-related NPE
...
* commit '631285a43f0c1de9df02d3ebd1c4e22a6ef74d1f':
Potential fix for a monkey-related NPE
2013-04-09 10:39:32 -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
b5e0ef2ae4
merge in master-release history after reset to master
2013-04-09 07:50:44 -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
bca88363b2
am 54f1b924
: Reconcile with jb-mr2-release - do not merge
...
* commit '54f1b924667589c519e395e3bd2e58e9c000376a':
Notification listeners can be enabled in Settings>Security.
Reference new StatusBarNotification and INotificationListener packages.
2013-04-08 13:40:34 -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
a738ede79a
Import translations. DO NOT MERGE
...
Change-Id: Ia600f0bea337c6a06f9fa46c62ca4ff2b164c6e6
Auto-generated-cl: translation import
2013-04-08 12:50:23 -07: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
26b016320d
am d1e485a8
: resolved conflicts for merge of 3a271718
to jb-mr2-dev-plus-aosp
...
* commit 'd1e485a8fc84e4aa279fcaf482fa2247b365574a':
Allow multiuser use of keystore
2013-04-08 12:10:16 -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