Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,765 Commits 3 Branches 0 Tags
7d97be9dbc8c220fa56e3665deb9b978a12ed71a
Commit Graph

6232 Commits

Author SHA1 Message Date
Chris Craik
f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. 
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
 2014-11-20 16:38:06 -08:00
Chet Haase
a2b3a75ca5 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
automerge: a79d2e8

* commit 'a79d2e86649dfb96159c2aebd94b4a5e19d66eb1':
  Fix seeking and scaled duration behavior
 2014-11-20 21:13:10 +00:00
Chris Craik
57b641a2ed am 3b2ba44b: Merge "Improve logging around performance critical events" into lmp-mr1-dev 
* commit '3b2ba44be3699a4e133d7a09cb4ed182405d7ff9':
  Improve logging around performance critical events
 2014-11-20 17:50:20 +00:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Chris Craik
70850ea258 Improve logging around performance critical events 
bug:17702227

Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.

Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
 2014-11-19 17:24:30 -08:00
Chet Haase
a79d2e8664 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
* commit '85603a7faf0a8067803ae6424bc590f6e2a17e07':
  Fix seeking and scaled duration behavior
 2014-11-20 00:07:50 +00:00
Chet Haase
85603a7faf Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 2014-11-20 00:02:09 +00:00
Chet Haase
0d1c27a713 Fix seeking and scaled duration behavior 
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
 2014-11-19 15:29:47 -08:00
Chris Craik
51888ef85d am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit 'df57b22bc679664138079a4f15966b19f63f0aea':
  Update clipToPadding docs
 2014-11-19 00:19:34 +00:00
Chris Craik
df57b22bc6 am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit '0455174d347bf451e830584bc3f6f35c3c560282':
  Update clipToPadding docs
 2014-11-19 00:09:32 +00:00
Chris Craik
0455174d34 Merge "Update clipToPadding docs" into lmp-mr1-dev 2014-11-18 23:33:30 +00:00
John Reck
de620d06ff am 51ce9cac: am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev 
* commit '51ce9cacb66d1ddac115c15375ca174d8b3eaf79':
  Don't invalidate() on setClipBounds
 2014-11-18 21:51:40 +00:00
John Reck
51ce9cacb6 am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev 
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
  Don't invalidate() on setClipBounds
 2014-11-18 21:46:44 +00:00
John Reck
cff98630e7 am fcd38813: am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev 
* commit 'fcd38813efad32f13d472ef6e99e47b3b9db8f28':
  Fix invalidateOutline
 2014-11-18 21:45:13 +00:00
John Reck
37cdc191e3 Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev 2014-11-18 21:41:17 +00:00
John Reck
fcd38813ef am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev 
* commit '3cf61d4b79a22f89b8fb839ef9ee2146fac4e703':
  Fix invalidateOutline
 2014-11-18 21:37:40 +00:00
John Reck
9029e5ecd0 Don't invalidate() on setClipBounds 
Bug: 17510133

This is a RenderNode property now, so use
the faster invalidateViewProperty() shortcut
since a re-record isn't necessary

Change-Id: If3999bce9a1fb9b60e42f0ee624bb554361f96ac
 2014-11-17 15:28:55 -08:00
John Reck
c99d3c99f8 Fix invalidateOutline 
Bug: 18175261

invalidateOutline was switched to a lazy-method, but this doesn't
work because invalidateViewProperty intentionally does not
do a traversal, therefore the invalidate was never consumed.

However it was attempting to be lazy about work that is cheap to
do, so nuke the lazy aspect and restore invalidateOutline's previous,
correct behavior. rebuildOutline is kept to avoid triggering
traversals in places they are not needed

Change-Id: I70f8cbacd54a607c0bf0bc7fe6eea78554cb2ea3
 2014-11-17 12:35:53 -08:00
John Reck
64b5e00aaa am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'ff5978988abceeb0f2c8324a9ab66b7c958edd34':
  Wire up surface width/height to lockHardwareCanvas
 2014-11-17 15:27:43 +00:00
John Reck
ff5978988a am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'b3ec64e1005c82d41b6d1a1d86b6933fd25d87d2':
  Wire up surface width/height to lockHardwareCanvas
 2014-11-17 15:23:11 +00:00
John Reck
b3ec64e100 Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 2014-11-17 15:19:23 +00:00
Chris Craik
b165296a9c Update clipToPadding docs 
Clarify that it doesn't clip anything but children,
and only if padding is non-zero.

Change-Id: I3e3ae31f52fc22304eb13d88765f9f4fc6e43e66
 2014-11-14 17:05:06 -08:00
John Reck
ff0c4856f4 am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev 
automerge: f1812b1

* commit 'f1812b17bb3396a28f3be8d19e0086de2be613a6':
  Document that circular reveal is async
 2014-11-14 22:58:50 +00:00
John Reck
f1812b17bb am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev 
* commit '8f5839be21f028885b6171e75cba479a020a3a0c':
  Document that circular reveal is async
 2014-11-14 22:07:29 +00:00
John Reck
8f5839be21 Merge "Document that circular reveal is async" into lmp-mr1-dev 2014-11-14 22:03:33 +00:00
John Reck
a3b35907de Document that circular reveal is async 
Bug: 18058966
Change-Id: I64b35441f12bec433f633580319ec73c1e11e7a2
 2014-11-14 14:02:55 -08:00
Raph Levien
7010d0b6c3 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
automerge: 58fa003

* commit '58fa0035775bbb897115bae1b59719391a1a7edd':
  Check bounds on CharSequence drawText methods
 2014-11-14 21:53:11 +00:00
Raph Levien
58fa003577 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
* commit '505ffe3633f45778e493e23ad8c163f09ed1dbb5':
  Check bounds on CharSequence drawText methods
 2014-11-14 20:56:46 +00:00
Raph Levien
505ffe3633 Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 2014-11-14 20:54:29 +00:00
Alan Viverette
db3aa6be93 am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 
* commit '04bea0905724e24ce8b80187134e7f698607ae1a':
  Account for window bounds in accessibility view click point computation
 2014-11-14 01:56:50 +00:00
Alan Viverette
04bea09057 am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 
* commit '0224d25db2f897ddfc29a722ad91d67dcf2500a9':
  Account for window bounds in accessibility view click point computation
 2014-11-14 01:51:38 +00:00
Alan Viverette
0224d25db2 Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 2014-11-14 01:46:01 +00:00
John Reck
b35c9602cf Wire up surface width/height to lockHardwareCanvas 
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
 2014-11-13 16:15:08 -08:00
Wale Ogunwale
442175076f am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 
* commit '21f16a475d0a212f9d3fb36659de5a59c2f80484':
  Cancel or drop key events if activity is stopped.
 2014-11-13 19:26:57 +00:00
Wale Ogunwale
21f16a475d am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 
* commit '28d3c245a1dde4aa5294192bec9980d8a93b0489':
  Cancel or drop key events if activity is stopped.
 2014-11-13 19:07:19 +00:00
Adam Powell
31de5dbe1e am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 
* commit 'e2820ed9636368884b09347ce49658757b696b71':
  Optimize setting padding and backgrounds for views
 2014-11-13 19:03:37 +00:00
Wale Ogunwale
28d3c245a1 Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev 2014-11-13 19:00:07 +00:00
Adam Powell
e2820ed963 am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 
* commit '87bc2acfd3e874ff94fd3da948c329d2547a2bfc':
  Optimize setting padding and backgrounds for views
 2014-11-13 18:57:43 +00:00
Adam Powell
87bc2acfd3 Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev 2014-11-13 18:12:54 +00:00
George Mount
cc66b9dfda am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit '4978ebe04f4c06f5672e734665c592838a5d634b':
  Update GhostView properly when underlying view changes.
 2014-11-12 23:51:25 +00:00
George Mount
a6d33fd7ba am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit '3ba2c7c681f3bf355cef1c6e32a6fdf315865f57':
  Fix getChildVisibleRect to clip correctly.
 2014-11-12 23:49:40 +00:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 23:49:19 +00:00
George Mount
4978ebe04f am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit 'fa781f8c2cdbd176d8ab8c9c82fcd6496e73e3be':
  Update GhostView properly when underlying view changes.
 2014-11-12 23:14:55 +00:00
George Mount
fa781f8c2c Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 2014-11-12 23:10:35 +00:00
Raph Levien
d82f8a9a38 Check bounds on CharSequence drawText methods 
The canvas drawText() methods on CharSequence arguments didn't check
whether the start and end offsets were within bounds, which triggered
native crashes. This patch checks the bounds and throws
IndexOutOfBoundsException when invalid.

Bug: 18282500
Change-Id: I1935bf21f828b960c817b40ebce6affd4ce8bb99
 2014-11-12 15:05:16 -08:00
George Mount
3ba2c7c681 am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit '70cb4f3e7131cda1e58c1f6d422e296c4935289d':
  Fix getChildVisibleRect to clip correctly.
 2014-11-12 22:46:08 +00:00
Alan Viverette
4acd0ecc7b Account for window bounds in accessibility view click point computation 
BUG: 18177402
Change-Id: If591d1b9e5a8a7c4cade3ef4f3ec5e42d623b53c
 2014-11-12 22:37:36 +00:00
Rob Tsuk
ccc956b2b4 am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit '41a8043b30a289bdba55a2469e598b3fe67c3bf1':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 22:36:18 +00:00
George Mount
70cb4f3e71 Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 2014-11-12 22:11:45 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00