Commit Graph

27197 Commits

Author SHA1 Message Date
Dianne Hackborn
390392ff3e Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 2012-09-19 12:52:32 -07:00
Dianne Hackborn
eba784ff4a Changes to support side-loading of apps from other users.
Change-Id: I5b7c0aa0dc9566b29d5980dc7f42a508a61a58d3
2012-09-19 12:42:37 -07:00
Adam Powell
10bd4106ef am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit 'baed0a8f0b43191c8f001e064ff42cf27a305d87':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 12:26:06 -07:00
Adam Powell
baed0a8f0b am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 12:21:15 -07:00
Fabrice Di Meglio
072533e934 Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 2012-09-19 12:11:49 -07:00
Adam Powell
56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 11:56:40 -07:00
Fabrice Di Meglio
efa568525f Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 2012-09-19 11:55:31 -07:00
Dianne Hackborn
09ad0832e0 Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 2012-09-19 11:40:18 -07:00
Dianne Hackborn
15491c6a72 Switch to showing top-most thumbnail of recent apps.
The way it should have been, and with the new recents enter animation
the way it must be.

Added a new method to retrieve this thumbnail, since it would be less
efficient to use the existing API (which always returns the "base"
thumbnail).  Probably at some point that existing API should be tweaked
to always return the top thumbnail instead, but that is for a later time.

Also removed code that would clear the thumbnail associated with an
activity when it is resumed.  I don't think there should ever be a
reason to clear a thumbnail -- it's much better to have *something*
for the task, even if it is a little out of date.

Change-Id: I83e6ca6403eb2df5e4de3009dfe8c210e8cf8d5b
2012-09-19 11:25:40 -07:00
Jeff Sharkey
a490bddc8b Merge changes I4513afbd,I20e2194c into jb-mr1-dev
* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
2012-09-19 11:22:14 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Narayan Kamath
5d1a870a25 Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 2012-09-19 01:31:36 -07:00
Irfan Sheriff
5d4206a55c Merge "Get strings in" into jb-mr1-dev 2012-09-18 22:34:34 -07:00
Irfan Sheriff
7f0aaac7f2 Get strings in
Bug: 65904101
Bug: 7087564
Change-Id: Ic4887a737a640010e12efd2a16b24af2215ba72a
2012-09-18 22:06:13 -07:00
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Fabrice Di Meglio
69542e48c3 Fix some typos in Javadoc for Accessibility APIs
Change-Id: Ie3ca20e1c3bb11fb59bd7dcaed9ea92be320b3eb
2012-09-18 19:34:34 -07:00
Adam Powell
98c370e71d Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 2012-09-18 18:42:59 -07:00
Adam Powell
4b6d93fd04 Make invalidateOptionsMenu asynchronous
Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.

Bug 7189372

Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8
2012-09-18 18:37:28 -07:00
Andy Stadler
8071124375 Move X509TrustManagerExtensions to correct directory
Also removed unused imports.

Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600

Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
2012-09-18 17:40:14 -07:00
Jeff Sharkey
3fe5bf6d69 Make getMediaStorageDirectory() user-aware.
Bug: 7173591
Change-Id: I4513afbd8c3d6a31cd66d8a149be4071d5a4d24c
2012-09-18 15:54:52 -07:00
Fabrice Di Meglio
9ffc6047f1 Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 2012-09-18 15:42:34 -07:00
Fabrice Di Meglio
c11f77fbae Fix bug #7173155 API REVIEW: android.view.View
- remove getFocusRect(Rect) as it was redundant
- fix Javadoc

Change-Id: I3784c4b0a38770cba5d3ba09196f9271050a3c20
2012-09-18 15:33:07 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -07:00
Fabrice Di Meglio
20586fa035 Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Adam Cohen
642258a29b Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Fabrice Di Meglio
dbed514e13 Merge "Fix bug #7172699" into jb-mr1-dev 2012-09-18 14:46:59 -07:00
Adam Cohen
60264730c1 Tweaking how settings adds keyguard widgets
-> Fix for issue 7173587
-> Fix for issue 7173877

Change-Id: I60cd3952113335df60292f67461d50f6c8bd2ed3
2012-09-18 14:38:04 -07:00
Amith Yamasani
599dd7ce9a DevicePolicyManager per user
Bug: 7136483

Store device policy information for each user and apply them when user switches.

Global proxy can only be controlled by owner.
Camera restriction applies to all users, if any one has an admin that disables it.
Storage encryption can only be controlled by owner, although other users can query the state.
Wipe data will only remove the user if non-zero, wipe the device, if zero.

Change-Id: I359be46c1bc3828fd13d4be3228f11495081c8f2
2012-09-18 14:28:33 -07:00
Geremy Condra
cb4c581975 Fix bad isinstance check in X509TrustManagerExtensions and add test.
Change-Id: I333957186655b2543a637dafa8c51b0bba9d4dfb
2012-09-18 13:43:32 -07:00
Jeff Sharkey
27bd34d9d9 Multi-user MTP.
The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. In addition, each MTP session
with a desktop requires unique object IDs, which doesn't hold true
across users on the device.

To solve these two issues, when switching users we cycle the USB host
stack to disconnect both local and remote MTP connections, giving the
new user's media process a chance to claim /dev/mtp_usb, and causing
the desktop to initiate a new MTP session.

This change also allows BroadcastReceivers to registerReceiver()
allow retrieval of a current sticky broadcast. Adds a system property
to override maximum users. Removes MOUNTED broadcasts for secondary
users. Allows INTERACT_ACROSS_USERS to getCurrentUser().

Bug: 6925114
Change-Id: I02b4a1b535af95fb2142655887b6d15a8068d18a
2012-09-18 13:26:26 -07:00
Fabrice Di Meglio
d3d9f3f100 Fix bug #7173351 API REVIEW: android.util.LocaleUtil
Change-Id: I08fd491eff714059e9ec874fadebe7eb556c34d5
2012-09-18 12:55:32 -07:00
Fabrice Di Meglio
49b0a9b470 Fix bug #7172699
- remove @link as we are already using a @see which is doing a link by itself

Change-Id: I6ff6979bb2d960c3c980cdf0a88885b92e80fd7f
2012-09-18 12:06:13 -07:00
Geremy Condra
00bc4c0b67 Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev 2012-09-18 11:39:14 -07:00
Geremy Condra
ed41a4e2d8 Initial commit for X509TrustManagerExtensions.
This provides a mechanism for exposing the bells
and whistles we've attached to trust managers to
third parties.

Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
2012-09-18 11:29:46 -07:00
Fabrice Di Meglio
b250e94fdc Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev 2012-09-18 10:47:07 -07:00
Narayan Kamath
b4db962da0 Add APIs to enable SNI and session tickets on sockets.
Change-Id: I34c546b22d31476a670c0e8f5724185e838903b0
2012-09-18 10:56:24 +01:00
Amith Yamasani
f7a6dfcafc Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 2012-09-17 22:53:21 -07:00
Amith Yamasani
e928d7d95d Pass Bitmap instead of ParcelFileDescriptor in UserManager
Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use
to monitor changes to the user name or icon.

Bug: 7164040
Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
2012-09-17 21:46:51 -07:00
Irfan Sheriff
5bc09e2683 Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 2012-09-17 20:58:42 -07:00
Irfan Sheriff
3809f500c3 Disable notification scans when p2p is connected
Also reduce scan interval for STA scans to one minute.

Bug: 7138968
Change-Id: I03620f6d462e4ec90d9bb25bbfe709f63173df21
2012-09-17 20:52:23 -07:00
Eric Laurent
21dfd7c5fe Merge "Update headphone volume safety warning message." into jb-mr1-dev 2012-09-17 18:29:27 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -07:00
Romain Guy
82f385a372 Merge "Add extra EGL error checking" into jb-mr1-dev 2012-09-17 18:20:55 -07:00
Romain Guy
740ee65d46 Add extra EGL error checking
Change-Id: I7cacef41ed08118c5eecf674e3d8461473692968
2012-09-17 18:11:40 -07:00
Michael Jurka
2bb25cd57a Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 2012-09-17 18:03:06 -07:00
Christopher Tate
f1aa107b18 Merge "Per-user content observer APIs" into jb-mr1-dev 2012-09-17 17:34:00 -07:00
Michael Jurka
e6d5545a53 Fixing construction of handler in AppWidgetHost
Change-Id: I1253f8e2ea1621208ad7d65e5c860a1df075a44a
2012-09-17 17:30:16 -07:00
Dianne Hackborn
8832c18d8b Fix API review bugs.
7173152 API REVIEW: android.content.pm.PackageUserState
7172969 API REVIEW: android.app.PendingIntent
7172730 API REVIEW: android.content.Context
7172726 API REVIEW: android.manifest.permission

Change-Id: Iad470256d3b5ca5596487f6a699ec1871457c3b5
2012-09-17 17:27:15 -07:00
Adam Powell
49a22f2969 Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 2012-09-17 17:15:09 -07:00
Eric Laurent
b6397c7170 Update headphone volume safety warning message.
Change-Id: Ic2d5d9d247b76b6ede0f90b861c235c1c0f5dc08
2012-09-17 16:59:19 -07:00