George Mount
0be5277cdc
am cc66b9df: am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev
...
* commit 'cc66b9dfda509ea8fd16adaa91a9f5f6adc9e21b':
Update GhostView properly when underlying view changes.
2014-11-13 00:00:33 +00:00
George Mount
d17a676a83
am a6d33fd7: am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev
...
* commit 'a6d33fd7ba55cde67ca56c93e3c68592686bb01e':
Fix getChildVisibleRect to clip correctly.
2014-11-13 00:00:20 +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
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
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
Rob Tsuk
4678dcc552
Add a way to override Xfermode DO NOT MERGE
...
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.
Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
2014-11-12 12:25:24 -08:00
Wale Ogunwale
3ae0d3157d
Fixed constant window switching on lock screen with Swype KB.
...
We allow TYPE_INPUT_METHOD windows to show on the lock screen.
These windows can attached other types of windows (For this
case the Swype KB was attaching a PopupWinow which will be
of TYPE_APPLICATION). This causes the popup window app token
to be added to the list of apps to be hidden on the lock
screen, thereby preventing the lock screen from been hidden,
which then causes a layout cycle(s). Now, we remove app
tokens for non-app windows from the hidden list in case it
was added by any attached widow they migth have.
Also, when we are updating window animations, set the
hideWhenLocked flag for windows that are IME tragets so
they don't go through unneeded cycles of having their
visibility policy set to hide/show/hide/show/...
Bug: 18021493
Change-Id: I3680256d41793f62def42fda00e26db1dcc990cc
2014-11-12 08:42:09 -08:00
George Mount
002d43d29b
Fix getChildVisibleRect to clip correctly.
...
Bug 18292516
getClipVisibleRect now takes into account clipChildren,
clipBounds, and clipToPadding.
Change-Id: I181cd68354e70767868e9edd56bf82a58357391d
2014-11-12 08:04:34 -08:00
George Mount
264d3a21a0
Update GhostView properly when underlying view changes.
...
Bug 18308803
Change-Id: Iad1366ea8fe3ba488dfb82ff1f9e170cafb4b2ec
2014-11-11 12:15:01 -08:00
George Mount
ed22607780
am 341df464: am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
...
* commit '341df46488576899773cdfd438033fccc077ed83':
Make setOutlineProvider change transitionGroup.
2014-11-11 15:53:05 +00:00
George Mount
341df46488
am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
...
* commit 'c07b6295c6fefe845ae15e2adad7aebb2280b1ab':
Make setOutlineProvider change transitionGroup.
2014-11-11 15:48:52 +00:00
George Mount
12403b242f
Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
2014-11-11 15:41:33 +00:00
Florian Salbrechter
940e97f802
Merge "Fixed missing opening quotes for href in javadoc."
2014-11-11 11:25:39 +00:00
Dan Sandler
f2d9b00832
am 34f24aef: am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev
...
* commit '34f24aef58b015709447cb09bad5f7ae0ca7989c':
Fix inset hinting when adding window
2014-11-10 22:13:03 +00:00
Dan Sandler
34f24aef58
am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev
...
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
Fix inset hinting when adding window
2014-11-10 22:04:09 +00:00
Adrian Roos
37d7a68de7
Fix inset hinting when adding window
...
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.
Also adds hinting for the stable insets.
Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
2014-11-10 17:46:57 +01:00
John Reck
e19093cad8
am f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
...
* commit 'f1923c368c5c08a477b9f94dea6a499798d91d4f':
Have an actual fallback if the surface is lost
2014-11-07 23:01:00 +00:00
John Reck
f1923c368c
am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
...
* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
Have an actual fallback if the surface is lost
2014-11-07 22:55:32 +00:00
John Reck
ca93f69c96
Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
2014-11-07 22:41:03 +00:00
John Reck
28b73f7743
am 692135ef: am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev
...
* commit '692135effb19df4da42ab8070ebdb29479bd9df0':
Fix finalizer ordering/double-free issue
2014-11-07 19:45:45 +00:00
John Reck
692135effb
am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev
...
* commit '76adcd6ec551637f57f2630a60f6cdb2bbbf908b':
Fix finalizer ordering/double-free issue
2014-11-07 19:41:08 +00:00
John Reck
ea4e76f68a
Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev
2014-11-07 19:29:47 +00:00
John Reck
65f2defdfc
resolve merge conflicts of cabf8a7 to master.
...
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
2014-11-07 11:29:08 -08:00
John Reck
aa95a88327
Have an actual fallback if the surface is lost
...
Bug: 17516789
This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame
Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
2014-11-07 11:02:07 -08:00
John Reck
cabf8a7064
am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev
...
* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
Fix wrong-thread issue
2014-11-07 18:48:43 +00:00
John Reck
4b19b7aaff
Merge "Fix wrong-thread issue" into lmp-mr1-dev
2014-11-07 18:34:55 +00:00
John Reck
c298f9c917
Fix finalizer ordering/double-free issue
...
Bug: 18289984
If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer
Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
2014-11-07 10:33:36 -08:00
John Reck
12f5e34332
Fix wrong-thread issue
...
Bug: 18259560
Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
2014-11-07 10:31:53 -08:00
Florian Salbrechter
9fdfbb4b38
Fixed missing opening quotes for href in javadoc.
...
Change-Id: I3a09b605e3430a6e540311c4d5e299050cc6236f
2014-11-07 16:15:05 +00:00
Winson Chung
c5f9ec3e27
am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
...
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
Adding bounce animation for affiliated tasks. (Bug 16656169)
2014-11-07 04:17:02 +00:00
Winson Chung
675a0b6bc9
am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
...
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
Adding bounce animation for affiliated tasks. (Bug 16656169)
2014-11-07 01:45:11 +00:00
Winson Chung
3ed9f2f903
Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
2014-11-07 01:30:20 +00:00
Justin Koh
402a360111
am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
...
* commit '4ca342cdba6fb2637415cfeb6e579cc662763daf':
Hide Surface#lockHardwareCanvas DO NOT MERGE
2014-11-07 00:05:54 +00:00
Winson Chung
044d52934e
Adding bounce animation for affiliated tasks. (Bug 16656169)
...
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
2014-11-06 14:02:35 -08:00
Justin Koh
2d42f48449
am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
...
* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
Hide Surface#lockHardwareCanvas DO NOT MERGE
2014-11-06 20:33:36 +00:00
George Mount
427c64140d
Make setOutlineProvider change transitionGroup.
...
Bug 18203878
Change-Id: Ia343477b8b37566e0fd8fd1a275b56e805bb18dc
2014-11-05 16:57:41 -08:00
Alan Viverette
8df94b5659
am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
...
* commit 'b6416716ad875a800c982dda77bafe910f9ed2d6':
Use default token instead of wrapped window manager
2014-11-05 05:03:59 +00:00
Alan Viverette
b6416716ad
am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
...
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
Use default token instead of wrapped window manager
2014-11-05 04:56:40 +00:00
Alan Viverette
9342b049b9
Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
2014-11-05 04:44:22 +00:00
Alan Viverette
838b7b6d05
am e48b397f: am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
...
* commit 'e48b397f93fb7ed4b7520d72368c2b4472f7cf5f':
Fix hasSurfaceInsets check when creating hardware renderer
2014-11-05 04:18:26 +00:00
Alan Viverette
a47e3e0572
am 69eb010b: am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
...
* commit '69eb010b1e2bc002b020b2722cc42447383bb5d3':
Abort accessibility node prefetch if parent node is null
2014-11-05 04:18:16 +00:00
Alan Viverette
e48b397f93
am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
...
* commit '405165b6cd749d0281bb1daa13bdf0a8f38112d9':
Fix hasSurfaceInsets check when creating hardware renderer
2014-11-05 04:06:21 +00:00
Alan Viverette
69eb010b1e
am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
...
* commit 'a77e349a3609833c55ee3b8b80fc5eef5fac4f1a':
Abort accessibility node prefetch if parent node is null
2014-11-05 04:05:58 +00:00
Alan Viverette
a446195b0d
Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
2014-11-05 02:09:30 +00:00