Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,089 Commits 3 Branches 0 Tags
404dc595e320254042543feebe707ed8ea86809d
Commit Graph

27325 Commits

Author SHA1 Message Date
Craig Mautner
404dc595e3 am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev 
* commit '8f301e666873e4a9feaace38a0b184a5f3ce7003':
  Add debug for b/7094175.
 2012-09-20 06:20:25 -07:00
Christopher Tate
0d2d123336 am a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 
* commit 'a1c46636dd533e889e1f3b3326fa0d851928df4f':
  Disable content observer cross-user permission checks...
 2012-09-20 06:20:17 -07:00
Dianne Hackborn
ba78386f79 am 390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 
* commit '390392ff3ef0114544eab3db4093c1c7aba825da':
  Changes to support side-loading of apps from other users.
 2012-09-20 06:20:13 -07:00
Adam Powell
41cb2840e1 am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '10bd4106efc22efd57875a2fb914110475c91856':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-20 06:20:00 -07:00
Fabrice Di Meglio
db7bb39b4c am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit '072533e934e759b95228ba61152e7d958b641b96':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-20 06:19:55 -07:00
Fabrice Di Meglio
a84d8ad3ba am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'efa568525fc7755ac49e44e75246b2be1ef5269f':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-20 06:19:52 -07:00
Dianne Hackborn
1ed950d0cd am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '09ad0832e0c28fa43a2e2bf53bef87df39bd4416':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-20 06:19:39 -07:00
Jeff Sharkey
ea59a8367e am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-20 06:19:30 -07:00
Craig Mautner
8f301e6668 Merge "Add debug for b/7094175." into jb-mr1-dev 2012-09-19 13:07:53 -07:00
Christopher Tate
a1c46636dd Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 2012-09-19 13:01:32 -07:00
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
Christopher Tate
e6c660ab35 Disable content observer cross-user permission checks... 
... until we have a solid fix for the singleton ContentProvider
problem cases in place.

Bug 7190837

Change-Id: Ibbef2ddc594896ba7b9217e2856c3e393f525af6
 2012-09-19 12:51:35 -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
7047ea7568 am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 
* commit '5d1a870a25f7495755432a42cf8c81818dc369fa':
  Add APIs to enable SNI and session tickets on sockets.
 2012-09-19 05:51:22 -07:00
Irfan Sheriff
48a9892dbd am 5d4206a5: Merge "Get strings in" into jb-mr1-dev 
* commit '5d4206a55c5336a163408422ba3302f5fd8463f7':
  Get strings in
 2012-09-19 05:50:40 -07:00
Amith Yamasani
b8e362ae27 am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '4adb9d34162b109db3c67e352ad50c76dc7f2d45':
  DevicePolicyManager per user
 2012-09-19 05:50:07 -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
171fa7f2c5 am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 
* commit '98c370e71d93ed2704018e2bc3455f00c08821a9':
  Make invalidateOptionsMenu asynchronous
 2012-09-18 18:47:17 -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
2e16d61257 am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 
* commit '6d4e887da4c8f2f0e246afd7961e2b2df0cc1aa4':
  Move X509TrustManagerExtensions to correct directory
 2012-09-18 17:54:36 -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
Fabrice Di Meglio
eef4e625d3 am 9ffc6047: Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 
* commit '9ffc6047f14883f853b643a2913bd590995b9031':
  Fix bug #7173155 API REVIEW: android.view.View
 2012-09-18 15:54:55 -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
ed1a377f80 am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev 
* commit '6281d7cf32bdc624a9d70b2b4f5abce342558c27':
  Multi-user MTP.
 2012-09-18 15:00:33 -07:00
Fabrice Di Meglio
8bf1cb378b am 20586fa0: Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 
* commit '20586fa0353f63453766140b32a4778793ce2b43':
  Fix bug #7173351 API REVIEW: android.util.LocaleUtil
 2012-09-18 15:00:14 -07:00
Adam Cohen
072d35167f am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 
* commit '642258a29b426b14da509df3a5ed912673feeb57':
  Tweaking how settings adds keyguard widgets
 2012-09-18 15:00:09 -07:00
Fabrice Di Meglio
9120d133b1 am dbed514e: Merge "Fix bug #7172699" into jb-mr1-dev 
* commit 'dbed514e137de66d19050b72ad941a687e13c9d4':
  Fix bug #7172699
 2012-09-18 14:59:59 -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
db85bee3e6 am cdf964ea: Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 
* commit 'cdf964eab3cb9381745886f35b8c5a73ba61e28d':
  Fix bad isinstance check in X509TrustManagerExtensions and add test.
 2012-09-18 14:04:14 -07:00