Commit Graph

5343 Commits

Author SHA1 Message Date
Jeff Brown
858737d08d resolved conflicts for merge of 4e5c089e to master-lockscreen-dev
Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1
2014-04-11 01:47:08 -07:00
Jeff Brown
4e5c089ef3 resolved conflicts for merge of 337e764d to master
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
2014-04-11 01:33:20 -07:00
Jeff Brown
337e764deb am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
  Plumb display power state through display manager.
2014-04-11 03:49:37 +00:00
Jeff Brown
037c33eae7 Plumb display power state through display manager.
Declare a new method, Display.getState() to retrieve the actual
power state of a display.

Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.

Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.

Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.

Eliminated the bright here and woke here policy flags since they
were unused.  Simplified the input dispatch policy somewhat.

Ensure that screen wake locks are respected up until the point
when dozing really begins.

Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.

Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
2014-04-10 20:46:14 -07:00
Alan Viverette
3b5f8522f7 am 494fb7b5: Update volume panel
* commit '494fb7b58a21a7a9a8eba3bacecffe115edcb8c6':
  Update volume panel
2014-04-11 01:16:17 +00:00
Alan Viverette
494fb7b58a Update volume panel
Change-Id: I6f0887069598f8addc5c5af5aef9c07a69532424
2014-04-10 18:13:08 -07:00
John Reck
c1776b1426 am 822bbb38: Merge "Make attachFunctor blocking"
* commit '822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
  Make attachFunctor blocking
2014-04-10 22:26:01 +00:00
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
John Reck
d3d8dafc2f Make attachFunctor blocking
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
2014-04-10 15:00:13 -07:00
Svetoslav
dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev
Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
2014-04-10 12:48:07 -07:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
John Reck
04c9040491 am 9817ddd4: Merge "Merge hasFunctors & pushStaging into prepareTree"
* commit '9817ddd420aaa885f92f778ae2cfd17e6a71bc87':
  Merge hasFunctors & pushStaging into prepareTree
2014-04-10 00:16:52 +00:00
John Reck
f4198b713e Merge hasFunctors & pushStaging into prepareTree
Bug: 13902607
 Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
2014-04-09 17:00:04 -07:00
John Reck
615c946448 am 8e1f9187: Merge "Switch DisplayListData to a staging model"
* commit '8e1f918738abf70a4dc86dbb12b386a9deea37f8':
  Switch DisplayListData to a staging model
2014-04-09 23:03:09 +00:00
John Reck
8e1f918738 Merge "Switch DisplayListData to a staging model" 2014-04-09 23:01:02 +00:00
John Reck
8de65a8e05 Switch DisplayListData to a staging model
Bug: 13912977

Change-Id: I5b2f664e797be22a58300964f57ceb4fab60528c
2014-04-09 15:48:00 -07:00
John Reck
dc6f2a254d am a040977d: Merge "Fix ThreadedRenderer.setEnabled()"
* commit 'a040977de8b3ec791bf3b7e0115630e8c27fd8ca':
  Fix ThreadedRenderer.setEnabled()
2014-04-09 18:12:45 +00:00
John Reck
f7d9c1dc84 Fix ThreadedRenderer.setEnabled()
Bug: 13914116
 Fixes lifecycle issues around setEnabled where ThreadedRenderer
 was reporting as being enabled before it had a Surface. This is
 incorrect.

 Also fix some EGL lifecycle issues

Change-Id: I12ebb279707f9b533a570b61d68735d858b560bf
2014-04-09 11:01:29 -07:00
John Reck
0e8c7aa485 am 77ecf0bb: Merge "Don\'t make HardwareRenderer calls in the finalizer"
* commit '77ecf0bb9687a4841a4880267bdb2cd7de05055f':
  Don't make HardwareRenderer calls in the finalizer
2014-04-08 21:27:14 +00:00
John Reck
77ecf0bb96 Merge "Don't make HardwareRenderer calls in the finalizer" 2014-04-08 21:22:42 +00:00
John Reck
0ed751dd22 Don't make HardwareRenderer calls in the finalizer
Bug: 13902530
 Don't try to set the RenderNode's displayListData to 0 in the finalizer.
 The HardwareRenderer may have already been finalized and it's not valid
 to make calls into HardwareRenderer from another thread anyway.

 The fix is that now that RenderNode is a refcounted object, this step
 can be skipped entirely. The RenderNode destructor handles deleting
 its DisplayListData if it needs to.

Change-Id: Ieab75575b98c24678a531dd5aa41a2d0afde0eef
2014-04-08 14:13:31 -07:00
Yohei Yukawa
cf1b3b4791 am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback"
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
  Allow IMEs to start/stop receiving onUpdateCursor callback
2014-04-08 05:52:14 +00:00
Yohei Yukawa
59fee2d553 Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 2014-04-08 05:48:45 +00:00
John Reck
95b8cfda9b am 1f3f55b4: Merge "Enable RT, round 2"
* commit '1f3f55b434ce324c5fdbe74db1982fea4812a2e9':
  Enable RT, round 2
2014-04-08 02:56:33 +00:00
John Reck
ed8c903a6c Enable RT, round 2
Change-Id: I8035f477f67ede9a5cd1b4de4498bc7850c7fbf3
2014-04-07 19:38:59 -07:00
John Reck
bbd924fa8c am 85189c5d: Merge "Fence on draws that are reported"
* commit '85189c5dafb08f051c7024f42ceedcbcf5dbbc7c':
  Fence on draws that are reported
2014-04-08 00:37:16 +00:00
John Reck
85189c5daf Merge "Fence on draws that are reported" 2014-04-08 00:32:15 +00:00
Svetoslav
1376d600d8 Adding render stats APIs to UiAutomation (framework).
bug:12927198

Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
2014-04-07 17:01:42 -07:00
John Reck
28ad7b52e0 Fence on draws that are reported
Change-Id: Ib2ec16cbda40f40df1710bdc868869ea8301f17e
2014-04-07 16:59:25 -07:00
George Mount
f4360efb52 am dde10d07: Merge "Implement "Back" for Activity Transitions."
* commit 'dde10d073f819e78c0b26d7f37ed10f01b45125c':
  Implement "Back" for Activity Transitions.
2014-04-07 16:22:46 +00:00
George Mount
cb4b7d999e Implement "Back" for Activity Transitions.
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
2014-04-07 09:00:13 -07:00
Yohei Yukawa
b7b7907fb5 Allow IMEs to start/stop receiving onUpdateCursor callback
This CL introduces an API which allows IMEs to start/stop
receiving onUpdateCursor callback upon their request.

BUG: 13388665
Change-Id: I987326872def181dda5d9d701b762f088e0d9c39
2014-04-04 04:34:44 +09:00
Chris Craik
a66a735dc6 am ef4c0c9f: Merge "Move most TransformationInfo properties to RenderNode"
* commit 'ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a':
  Move most TransformationInfo properties to RenderNode
2014-04-03 17:20:10 +00:00
Chris Craik
ef4c0c9fd5 Merge "Move most TransformationInfo properties to RenderNode" 2014-04-03 17:14:53 +00:00
Ben Murdoch
55da62288d am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '14424043b9c20edf639004e05fe8e9264a2e66f5':
  Update ViewRootImpl for 64bit functor type.
2014-04-03 10:00:25 +00:00
Alan Viverette
031c49ff1c am aa11084c: Merge "Fix dialog style, selectable item bg pinning, and pressed state"
* commit 'aa11084c3ba1bf166febce53ccb9852f72f2a4a5':
  Fix dialog style, selectable item bg pinning, and pressed state
2014-04-03 02:38:22 +00:00
Alan Viverette
45dc35b3c9 Fix dialog style, selectable item bg pinning, and pressed state
BUG: 13746931
Change-Id: I31c2959f3e773a3aeb66ba5842d8d6fbb288acc1
2014-04-02 19:32:15 -07:00
Chris Craik
49e6c73913 Move most TransformationInfo properties to RenderNode
This change dedupes the various properties that were represented both
in TransformationInfo, and RenderProperties on the native side.

RenderNode (and its associated properties) are now permanently
attached to a View in SW or HW. The native copy of these properties
are their sole representation.

Alpha to come in a later CL.

Also fixed issue with copying RenderNode's transform, and added
support of deleting RenderNodes in software rendering.

Change-Id: Ideb6e7f32b780e87aa1c32637c368356b3eee3a1
2014-04-02 18:38:25 -07:00
Jorim Jaggi
ae6ffcc3c7 Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev 2014-04-02 21:22:59 +00:00
Jorim Jaggi
cff0acb6b1 Wait for Keyguard to be drawn after boot.
The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.

In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.

Bug: 13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
2014-04-02 22:11:19 +02:00
John Reck
4ae6e2f909 am a8b93711: Merge "Revert "Force-enable hardware acceleration for apps""
* commit 'a8b937115ac3bf047c8fc6c750f052fd633c5dd8':
  Revert "Force-enable hardware acceleration for apps"
2014-04-02 18:07:27 +00:00
John Reck
a8b937115a Merge "Revert "Force-enable hardware acceleration for apps"" 2014-04-02 18:03:49 +00:00
John Reck
dd58e797aa Revert "Force-enable hardware acceleration for apps"
This reverts commit 2a09011074.

Change-Id: I47c58b7251411432bd6a3eeb6fe567385b1c084f
2014-04-02 16:54:28 +00:00
Ben Murdoch
cf61c9b71f Update ViewRootImpl for 64bit functor type.
Change-Id: Ie9020f0276c58ebf0977e4aef725fbc26aaf67b2
2014-04-02 14:41:41 +01:00
John Reck
624818b0c1 am 4126693b: Merge "Disable RenderThread"
* commit '4126693be37244116d23e9c6dce2a15b88ad988f':
  Disable RenderThread
2014-04-01 21:57:34 +00:00
John Reck
9afe775ca9 Disable RenderThread
Now that there's a half dozen bugs to fix, switch back
 to the stable renderer until the issues are addressed

Change-Id: I1513cf26717e8ab6b1a038e86ae9a40f5f1a3c50
2014-04-01 14:49:21 -07:00
ztenghui
2b2ad8f728 am 2f9ec356: Merge "Make the reveal animation API public"
* commit '2f9ec3560d21e3db4f91a64e68d6b678714cd749':
  Make the reveal animation API public
2014-03-31 20:10:46 +00:00
ztenghui
2f9ec3560d Merge "Make the reveal animation API public" 2014-03-31 20:08:12 +00:00
John Reck
0949792f77 am b4a132a0: Merge "Turn on RenderThread"
* commit 'b4a132a05f5dc1cc10352d63cb80921b1004bd7a':
  Turn on RenderThread
2014-03-31 19:14:23 +00:00
John Reck
b4a132a05f Merge "Turn on RenderThread" 2014-03-31 19:09:13 +00:00