Alan Viverette
b7fbcefcec
am db3aa6be: am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
...
* commit 'db3aa6be933b732c57e7e124f40388b0695a3638':
Account for window bounds in accessibility view click point computation
2014-11-14 19:18:32 +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
Wale Ogunwale
1166443a48
am 44217507: am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
...
* commit '442175076fbd969ee1cda7e64f0d03b4a820262f':
Cancel or drop key events if activity is stopped.
2014-11-14 00:47:35 +00:00
Adam Powell
4aa1ca3c5d
am 31de5dbe: am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
...
* commit '31de5dbe1ed32a611a8ba0e132570359cd7956c9':
Optimize setting padding and backgrounds for views
2014-11-14 00:45:40 +00: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
Rob Tsuk
95e5a82e1d
Merge "Add a way to override Xfermode"
2014-11-13 17:17:06 +00:00
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
Rob Tsuk
c495e611b9
Add a way to override Xfermode
...
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.
Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
2014-11-12 15:49:45 -08: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
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
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
Adam Powell
05f35127e3
Optimize setting padding and backgrounds for views
...
Don't reset the entire chain of child views whenever we set our own
padding or background; clear our own bidi resolution bits only. This
prevents doing a lot of extra recursive work when changing properties
of a parent view that cannot affect children.
Bug 18159214
Change-Id: I94300402785c79c3199e768ad7b6d7027d8d5d5f
2014-11-12 10:26:32 -08:00
Wale Ogunwale
c3672cd3f7
Cancel or drop key events if activity is stopped.
...
After an activity instance state is saved due to onStop()/onPause(),
there is a small window where it can still get key events like the
back button since we still allow the ActivityThread to handle
pending messages (like memory trim request) before informing the
activity manager that we are done. If the activity is stopped,
we will now drop non-terminal input events and set the cancel
flag on terminal events.
Bug: 18151331
Change-Id: I370d7c871530eea4b16fa42428d0248f1a87abb6
2014-11-12 09:23:22 -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