drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,999 Commits 1 Branch 0 Tags
Commit Graph

84999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
2fe2700b7c am ba118c25: am 9e3045c7: Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 
* commit 'ba118c25fb03b67514cd86a791bb63367cb21645':
  Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
 2012-08-29 16:34:31 -07:00
Matthew Xie
ba118c25fb am 9e3045c7: Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 
* commit '9e3045c75c80d859dd16087e69f5bfbe15ca8bf4':
  Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
 2012-08-29 16:32:21 -07:00
Matthew Xie
9e3045c75c Merge "Turn off verbose debug message in BluetoothAdapter Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f" into jb-mr1-dev 2012-08-29 16:30:14 -07:00
Jeff Sharkey
8ea0dc6a89 Shared OBB storage across users. 
To avoid downloading large OBB files separately for each user,
provide a shared view of /sdcard/Android/obb to all apps.  Added
upgrade step to migrate the owners existing OBB files to become
the default view.

Bug: 7008879
Change-Id: I199321552fa7d4b97d5ed7fc3b3bc41f23618601
 2012-08-29 16:20:03 -07:00
Irfan Sheriff
005caa5322 am 5df5e7da: am a28c18fc: Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 
* commit '5df5e7da516e4021062b0b8f2ff73166d4f216f2':
  Fix DHCP handling at disconnect/reconnect
 2012-08-29 16:00:05 -07:00
Chris Craik
d29a2f384e am 339d48d5: am 402206b6: Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev 
* commit '339d48d5d6137b64b8024247b7dfad60744778eb':
  Use smoothstep to eliminate branches in AA shader
 2012-08-29 15:58:26 -07:00
John Spurlock
9e3421eb06 am 1f2e9b59: am b2c94ec8: Merge "Change default setting for dreams to \'when docked\'" into jb-mr1-dev 
* commit '1f2e9b59247c656774ca09449179c001df22cd59':
  Change default setting for dreams to 'when docked'
 2012-08-29 15:58:22 -07:00
Irfan Sheriff
5df5e7da51 am a28c18fc: Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 
* commit 'a28c18fc618e4bf58da6417166b1ee249dc16ea9':
  Fix DHCP handling at disconnect/reconnect
 2012-08-29 15:57:58 -07:00
Irfan Sheriff
a28c18fc61 Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 2012-08-29 15:55:43 -07:00
Chris Craik
339d48d5d6 am 402206b6: Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev 
* commit '402206b6e25af5d9e103cae215048c7a41d68d39':
  Use smoothstep to eliminate branches in AA shader
 2012-08-29 15:55:11 -07:00
John Spurlock
1f2e9b5924 am b2c94ec8: Merge "Change default setting for dreams to \'when docked\'" into jb-mr1-dev 
* commit 'b2c94ec893578dd95cac81b43726829503f29d47':
  Change default setting for dreams to 'when docked'
 2012-08-29 15:55:08 -07:00
Chris Craik
402206b6e2 Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev 2012-08-29 15:53:31 -07:00
John Spurlock
b2c94ec893 Merge "Change default setting for dreams to 'when docked'" into jb-mr1-dev 2012-08-29 15:53:31 -07:00
Jeff Brown
c9996258ca am f1b88ab2: am d5ea3b46: Merge "Add initial multi-display support." into jb-mr1-dev 
* commit 'f1b88ab27d8fc675121a53f44103c8730d66ccd1':
  Add initial multi-display support.
 2012-08-29 15:49:56 -07:00
Benoit Goby
d0691f7465 am 375b80fc: am 0552cbcf: Merge "UsbDebuggingManager: add missing break in switch" into jb-mr1-dev 
* commit '375b80fc90070f24d69f4c368b8d74913e510af5':
  UsbDebuggingManager: add missing break in switch
 2012-08-29 15:48:17 -07:00
Jeff Brown
51f9ad1f6e am 16e64d1a: am 731b8996: Merge "Run with scissors." into jb-mr1-dev 
* commit '16e64d1ac6e1fac38f7af4fd2d68cfe6ebd994be':
  Run with scissors.
 2012-08-29 15:48:14 -07:00
Matthew Xie
3b6214f373 Turn off verbose debug message in BluetoothAdapter 
Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
 2012-08-29 15:47:41 -07:00
Jeff Brown
f1b88ab27d am d5ea3b46: Merge "Add initial multi-display support." into jb-mr1-dev 
* commit 'd5ea3b464795d4e6adbdd174d1bd2f78b628e280':
  Add initial multi-display support.
 2012-08-29 15:46:47 -07:00
Benoit Goby
375b80fc90 am 0552cbcf: Merge "UsbDebuggingManager: add missing break in switch" into jb-mr1-dev 
* commit '0552cbcf29f266f608e8326bc467b6afb13b7f3a':
  UsbDebuggingManager: add missing break in switch
 2012-08-29 15:44:54 -07:00
Jeff Brown
16e64d1ac6 am 731b8996: Merge "Run with scissors." into jb-mr1-dev 
* commit '731b8996eaa7e45b206273d4691506069229449a':
  Run with scissors.
 2012-08-29 15:44:51 -07:00
Selim Gurun
49444838dc am 3b82c5de: am 8506ce1a: Merge "Provide referer to browser on download request." into jb-mr1-dev 
* commit '3b82c5de7f8da48cdfb45654be1773ac67cf6729':
  Provide referer to browser on download request.
 2012-08-29 15:44:46 -07:00
Jeff Brown
d5ea3b4647 Merge "Add initial multi-display support." into jb-mr1-dev 2012-08-29 15:43:55 -07:00
Benoit Goby
509bf2d2cf UsbDebuggingManager: Fix restart when toggling USB debugging 
Change-Id: Iaaec9162b03c4ea77735d096eec670392c61308a
 2012-08-29 15:43:51 -07:00
Benoit Goby
0552cbcf29 Merge "UsbDebuggingManager: add missing break in switch" into jb-mr1-dev 2012-08-29 15:42:36 -07:00
Jeff Brown
731b8996ea Merge "Run with scissors." into jb-mr1-dev 2012-08-29 15:41:57 -07:00
Selim Gurun
3b82c5de7f am 8506ce1a: Merge "Provide referer to browser on download request." into jb-mr1-dev 
* commit '8506ce1a3f427d4c3495d6ec13c1b644aa4701fe':
  Provide referer to browser on download request.
 2012-08-29 15:41:36 -07:00
Selim Gurun
8506ce1a3f Merge "Provide referer to browser on download request." into jb-mr1-dev 2012-08-29 15:39:11 -07:00
Irfan Sheriff
6bfc88876a Fix DHCP handling at disconnect/reconnect 
Wifi can have a quick disconnection followed by a reconnection. We used to
create a new DHCP state machine thread for every new connection and
never really waited until it quit after disconnect. This may have lead to
situations where repeated disconnect/reconnects resulted in multiple dhcp
start calls.

We now keep the statemachine after a disconnect and only shut it at supplicant
stop.

Bug: 6417686
Change-Id: Icf66efdc654be886e3eb46c81f09f8cce536f2f6
 2012-08-29 15:35:57 -07:00
Jeff Brown
bd6e1500ae Add initial multi-display support. 
Split the DisplayManager into two parts.  One part is bound
to a Context and takes care of Display compatibility and
caching Display objects on behalf of the Context.  The other
part is global and takes care of communicating with the
DisplayManagerService, handling callbacks, and caching
DisplayInfo objects on behalf of the process.

Implemented support for enumerating Displays and getting
callbacks when displays are added, removed or changed.

Elaborated the roles of DisplayManagerService, DisplayAdapter,
and DisplayDevice.  We now support having multiple display
adapters registered, each of which can register multiple display
devices and configure them dynamically.

Added an OverlayDisplayAdapter which is used to simulate
secondary displays by means of overlay windows.  Different
configurations of overlays can be selected using a new
setting in the Developer Settings panel.  The overlays can
be repositioned and resized by the user for convenience.

At the moment, all displays are mirrors of display 0 and
no display transformations are applied.  This will be improved
in future patches.

Refactored the way that the window manager creates its threads.
The OverlayDisplayAdapter needs to be able to use hardware
acceleration so it must share the same UI thread as the Keyguard
and window manager policy.  We now handle this explicitly as
part of starting up the system server.  This puts us in a
better position to consider how we might want to share (or not
share) Loopers among components.

Overlay displays are disabled when in safe mode or in only-core
mode to reduce the number of dependencies started in these modes.

Change-Id: Ic2a661d5448dde01b095ab150697cb6791d69bb5
 2012-08-29 15:34:17 -07:00
Svetoslav Ganov
c2e57573e3 am 5954d97c: am f0340d15: Merge "Don\'t overwrite accessibility delegates in AbsListView items." into jb-mr1-dev 
* commit '5954d97c9c7f823f0089e6ba39b318eae9d795e5':
  Don't overwrite accessibility delegates in AbsListView items.
 2012-08-29 14:26:47 -07:00
Svetoslav Ganov
5954d97c9c am f0340d15: Merge "Don\'t overwrite accessibility delegates in AbsListView items." into jb-mr1-dev 
* commit 'f0340d156c9adf974cba36e806049f66e111fab7':
  Don't overwrite accessibility delegates in AbsListView items.
 2012-08-29 14:24:20 -07:00
Svetoslav Ganov
f0340d156c Merge "Don't overwrite accessibility delegates in AbsListView items." into jb-mr1-dev 2012-08-29 14:21:18 -07:00
John Spurlock
4e724c8423 Change default setting for dreams to 'when docked' 
Bug:7078718
Change-Id: I4ec74cc9562ab728d6f86938758ede74c241c63b
 2012-08-29 17:14:49 -04:00
Jim Miller
29da8387bf am 99a97d52: am d45e5f61: Merge "Enable new keyguard" into jb-mr1-dev 
* commit '99a97d526330483482b27c2c7c1fb2f2a692494f':
  Enable new keyguard
 2012-08-29 14:02:01 -07:00
Jim Miller
99a97d5263 am d45e5f61: Merge "Enable new keyguard" into jb-mr1-dev 
* commit 'd45e5f610ca976cf5a56ce12ba18b39497243fe3':
  Enable new keyguard
 2012-08-29 13:59:37 -07:00
Jim Miller
d45e5f610c Merge "Enable new keyguard" into jb-mr1-dev 2012-08-29 13:57:14 -07:00
Benoit Goby
37ce5c5d5e UsbDebuggingManager: add missing break in switch 
Bug: 7079044
Change-Id: Icf4090e79af47db7d068981537c97f2028d8e405
 2012-08-29 13:52:17 -07:00
Jim Miller
9c7e630e3f Enable new keyguard 
Change-Id: I52af2d4f9083120616f012138a60b557a0eb70cf
 2012-08-29 13:48:34 -07:00
Jean-Baptiste Queru
d50eff5935 am 959c05a1: am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe" 
* commit '959c05a122fbe44fd97860ae11ef6be84b52d31e':
  Make addAddress locale safe
 2012-08-29 13:08:41 -07:00
Jean-Baptiste Queru
959c05a122 am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe" 
* commit '69626dab17f9e059cfa2e8c3ce4ec9aaa5f9853e':
  Make addAddress locale safe
 2012-08-29 13:06:08 -07:00
Jean-Baptiste Queru
69626dab17 am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe" 
* commit '4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a':
  Make addAddress locale safe
 2012-08-29 13:03:41 -07:00
Jean-Baptiste Queru
4a4edbbfce am 7fecf5f4: Merge "Make addAddress locale safe" 
* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
  Make addAddress locale safe
 2012-08-29 12:59:06 -07:00
Jim Miller
0b63b536aa am 8897b4f5: am c134885e: Merge "Replace keyguard with new implementation" into jb-mr1-dev 
* commit '8897b4f530aace505a65e0ff66fdf0561a4b30fd':
  Replace keyguard with new implementation
 2012-08-29 12:56:46 -07:00
Jim Miller
8897b4f530 am c134885e: Merge "Replace keyguard with new implementation" into jb-mr1-dev 
* commit 'c134885e6f2aae3a2af446623be9f195c2713bc4':
  Replace keyguard with new implementation
 2012-08-29 12:55:11 -07:00
Jim Miller
c134885e6f Merge "Replace keyguard with new implementation" into jb-mr1-dev 2012-08-29 12:52:09 -07:00
Jim Miller
dcb3d84b82 Replace keyguard with new implementation 
This change refactors keyguard to be more modular and maintainable.  More
specifically, it replaces the top-level view with just one device-dependent
view that contains two views: a widget area and a security area.

The widget area can be populated with custom widgets.

The security area contains the current security method as dictated by
the stored password quality.

This change contains both the old and the new keyguard with the old keyguard
still enabled.  The new keyguard will be enabled in a subsequent change.

Change-Id: Id75286113771ca1407e9db182172b580f870b612
 2012-08-29 12:36:26 -07:00
Jean-Baptiste Queru
7fecf5f451 Merge "Make addAddress locale safe" 2012-08-29 12:19:04 -07:00
Jean-Baptiste Queru
ba3af4625c am 8866d4eb: am 38f19786: am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly" 
* commit '8866d4eb51f97cf3305258788b975aeb9ca50f05':
  Fix SkBitmap::fPixels not being locked correctly
 2012-08-29 12:04:10 -07:00
Jean-Baptiste Queru
8866d4eb51 am 38f19786: am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly" 
* commit '38f197863a07cd600b45d752fdfa949d8b2e6fa6':
  Fix SkBitmap::fPixels not being locked correctly
 2012-08-29 12:02:11 -07:00
Jean-Baptiste Queru
38f197863a am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly" 
* commit '14c0c989d21531056a5d0a0739c3ffdd1b04b295':
  Fix SkBitmap::fPixels not being locked correctly
 2012-08-29 12:00:10 -07:00