Adam Lesinski
b5c8a98b76
Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37
...
am: ce71c120df
Change-Id: I93c1714ded50dc0233185f68b08b7b7803cfc264
2016-06-22 21:22:15 +00:00
Rob Carr
3bff3a2525
Merge "resolve merge conflicts of 79116da to master"
2016-06-22 21:17:45 +00:00
Robert Carr
0db4052d51
resolve merge conflicts of 79116da to master
...
Change-Id: Ia6e42d99097da86e23b9d33659259d264a365c45
2016-06-22 12:39:12 -07:00
John Reck
d2be84ff7c
Merge "Delete unused args"
2016-06-22 19:36:50 +00:00
Adam Lesinski
ce71c120df
Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am: 0bf31c3fa6
...
am: a72a6aae37
Change-Id: I8c85a4bb67d470c5bba5bcf81915e4684019027b
2016-06-22 19:27:30 +00:00
Adam Lesinski
a72a6aae37
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
2016-06-22 19:17:43 +00:00
Adam Lesinski
0bf31c3fa6
Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev
2016-06-22 19:11:36 +00:00
Robert Carr
79116da979
Merge changes from topic \'seamless-rotation\' into nyc-mr1-dev
...
am: f8142e5bf3
Change-Id: I2facb8e9453e370219c61159a6738827baa9a7d9
2016-06-22 17:49:12 +00:00
TreeHugger Robot
f8142e5bf3
Merge changes from topic 'seamless-rotation' into nyc-mr1-dev
...
* changes:
Enable resize during relayout fix for all stacks.
SurfaceView: Careful with FLAG_PRESERVE_GEOMETRY.
Implement seamless rotation mode.
2016-06-22 17:40:48 +00:00
Adam Lesinski
4ece3d6bb1
ContextImpl: Keep DisplayAdjustments and Display in sync
...
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.
Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
2016-06-21 17:55:58 -07:00
Robert Carr
15e0bb4264
SurfaceView: Careful with FLAG_PRESERVE_GEOMETRY.
...
We need to be careful about stripping FLAG_PRESERVE_GEOMETRY
as it breaks render thread sync. Notably we don't need
to strip it in the case of mUpdateWindowNeeded, this just signals
that Window#resized has been called, or something similar, but if there
has been no actual size change, then we can leave the geometry to
the render thread. This particularly manifests in rotation scenarios
where the SurfaceView will receive resize ahead of the app receiving
a configuration change.
Bug: 28823590
Change-Id: Ie2bbe7d9bd9f0a5ab64a08776bae7344eaecb605
2016-06-21 17:13:19 -07:00
Robert Carr
6da3cc0237
Implement seamless rotation mode.
...
Add a rotation mode which does not require freezing
the screen. For situations like Camera where only small
elements move on screen, this allows for seamless changes
of display orientation. This is achieved by transforming the
windows with their current buffer in the same transaction that
we rotate the display. We set things up so the windows are
frozen this way until they submit buffers in the new orientation.
There is a special case in the Camera window itself, and it's use
of NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY. In this case the buffer
contents are rotated by SurfaceFlinger and will never resize, for these
windows we just need to update the scaling matrix.
Bug: 28823590
Change-Id: I52dc6a86fcb3c08f736f0977ba3975a24fb8136c
2016-06-21 17:13:15 -07:00
Yorke Lee
c502ca33ed
Merge \\\"Tweaks to DragAndDropPermissions behavior\\\" into nyc-dev am: 22faa5ddb1 am: 072ce0c29c
...
am: bf18ee7b76
Change-Id: Ib9dc30baa67a137749b2cb6bafe5ccb0de48d769
2016-06-21 23:56:51 +00:00
Yorke Lee
bf18ee7b76
Merge \\"Tweaks to DragAndDropPermissions behavior\\" into nyc-dev am: 22faa5ddb1
...
am: 072ce0c29c
Change-Id: Iee2afec7bd3b6d6a81ce179df9e52a9e20bc1b72
2016-06-21 23:37:51 +00:00
Yorke Lee
d22536666a
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
...
am: 22faa5ddb1
Change-Id: Ia37191b026b85773d27b41b7991238a07e141a12
2016-06-21 23:35:09 +00:00
John Reck
ab1080c4d0
Delete unused args
...
Bug: 21170575
Change-Id: Icc832f70f206342557f44667ad3498405d04db78
2016-06-21 16:24:20 -07:00
Yorke Lee
072ce0c29c
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
...
am: 22faa5ddb1
Change-Id: Icbe2a2b78d19dbdf067aa69a2e0c539a809893aa
2016-06-21 21:20:11 +00:00
Yorke Lee
c8ad0cd316
Tweaks to DragAndDropPermissions behavior
...
No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.
Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.
Bug: 29162822
Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896
2016-06-21 12:57:52 -07:00
John Reck
f5159155d0
Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev
...
am: d11b5e6661
Change-Id: I1caf2fbac785c68c6afeb61b60493e728a83a670
2016-06-18 02:14:29 +00:00
Chong Zhang
b0e28cf5b3
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
...
am: 2756d0707f
Change-Id: I72a8192317ebaa7c036416a65b415c2471f449de
2016-06-18 02:07:55 +00:00
Yohei Yukawa
045de3f08c
Merge \\"API Rename: IC#inputContent to IC#commitContent.\\" into nyc-mr1-dev am: 01e7c10d37
...
am: 0d7dcf7bc3
Change-Id: I5c4209a79e7426192da082100ac2a7517de36b81
2016-06-17 23:38:28 +00:00
Yohei Yukawa
0d7dcf7bc3
Merge \"API Rename: IC#inputContent to IC#commitContent.\" into nyc-mr1-dev
...
am: 01e7c10d37
Change-Id: I5aa903ee453a3945d3f2710d2b6734443fcbd972
2016-06-17 23:31:12 +00:00
Yohei Yukawa
01e7c10d37
Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev
2016-06-17 23:23:59 +00:00
John Reck
29d562fa01
Merge \\"Move SurfaceView offscreen if the app stops drawing it\\" into nyc-mr1-dev am: e66dedf35b
...
am: 61513724f0
Change-Id: Ic02576c35007d6aaaa8807c529ab54717d2740a7
2016-06-17 21:51:20 +00:00
Chong Zhang
a87c74d7e1
Merge \\\"Do a forceLayout if pending insets is changed after relayout window\\\" into nyc-dev am: 2756d0707f am: dba235d91a
...
am: 788f4309ac
Change-Id: I3de76ea399768aa9f9cc504bdcb25208e60c579d
2016-06-17 21:48:58 +00:00
Yorke Lee
0933cf3f15
Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am: f33af2285b am: 3d80871032
...
am: 11e3bf5d30
Change-Id: I6a99d04fd3f9fb229f532838350313169cec502a
2016-06-17 20:42:14 +00:00
John Reck
34bf49e4de
DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it
...
Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
(cherry picked from commit aa6e84f21d )
2016-06-17 20:26:10 +00:00
John Reck
61513724f0
Merge \"Move SurfaceView offscreen if the app stops drawing it\" into nyc-mr1-dev
...
am: e66dedf35b
Change-Id: I3d070161a4bdacd0cdcf2e61f026f9fffe15890e
2016-06-17 20:20:38 +00:00
John Reck
e66dedf35b
Merge "Move SurfaceView offscreen if the app stops drawing it" into nyc-mr1-dev
2016-06-17 20:13:20 +00:00
Chong Zhang
788f4309ac
Merge \\"Do a forceLayout if pending insets is changed after relayout window\\" into nyc-dev am: 2756d0707f
...
am: dba235d91a
Change-Id: I1a9758b62322aecaea79c879f82b1793bae67061
2016-06-17 18:32:31 +00:00
Chong Zhang
dba235d91a
Merge \"Do a forceLayout if pending insets is changed after relayout window\" into nyc-dev
...
am: 2756d0707f
Change-Id: Ia95dd424c118b962a9a10ac074d508758b49ea90
2016-06-17 18:26:45 +00:00
John Reck
aa6e84f21d
Move SurfaceView offscreen if the app stops drawing it
...
Bug: 29360411
Change-Id: Iefb9d7a9dafb34a2b4f79130a2a8b5a7cf7de906
2016-06-17 10:23:54 -07:00
Yohei Yukawa
adebb52588
API Rename: IC#inputContent to IC#commitContent.
...
As shown in below, we have already used commit* naming convention in
InputConnection.
- InputConnection#commitCompletion(CompletionInfo);
- InputConnection#commitCorrection(CorrectionInfo);
- InputConnection#commitText(CharSequence, int);
Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.
Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
2016-06-17 10:10:39 -07:00
Chong Zhang
71f2c31469
Do a forceLayout if pending insets is changed after relayout window
...
We might have a pending MSG_RESIZED_REPORT, but if it's executed after
relayoutWindow, mPendingInsets will already be the new value and it'll
not forceLayout. So we need to forceLayout here to make sure the measure
cache is cleared.
bug: 29391054
Change-Id: I73793b1427b89e75700369ec3b37053a6a732f0d
2016-06-17 01:11:49 +00:00
Yorke Lee
11e3bf5d30
Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am: f33af2285b
...
am: 3d80871032
Change-Id: I2f7745317f6ae0932d7c16469b500847e465a912
2016-06-16 21:27:50 +00:00
Yorke Lee
3d80871032
Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
...
am: f33af2285b
Change-Id: I539f39cfea50f34dade2141829b21d422809b09f
2016-06-16 21:22:22 +00:00
Yorke Lee
599cf6bc4a
Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
...
am: f33af2285b
Change-Id: If4d9abfb81929f8366fc9acc7978816d55117fbc
2016-06-16 21:21:57 +00:00
Yorke Lee
0e85247195
Limit global drags to apps targeting SDK 24 and above
...
Bug: 29127791
Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc
2016-06-16 09:35:40 -07:00
Selim Cinek
e6ec63ffa6
Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc-dev am: c1720dce1b am: 0630d92064
...
am: 7a0051b68f
Change-Id: Ia1052c236a6dd85e694992db4f7515bab6c78764
2016-06-16 04:35:48 +00:00
Selim Cinek
7a0051b68f
Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
...
am: 0630d92064
Change-Id: I01afc02fe75b0ae7223e9deba6355ed00961faaa
2016-06-16 04:30:32 +00:00
Selim Cinek
0630d92064
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
...
am: c1720dce1b
Change-Id: I25bd41f1307233bba14067952086ca7be3118505
2016-06-16 04:25:26 +00:00
Selim Cinek
447ee99755
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
...
am: c1720dce1b
Change-Id: I14674254eb79fef58e4dcb1a8d7ecaab24831691
2016-06-16 04:25:26 +00:00
Selim Cinek
e9bad242f3
Added dismiss, expand, and collapse accessibility actions
...
Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
2016-06-15 16:30:09 -07:00
Yohei Yukawa
e3d3740f1c
Merge \\"Add InputConnection#insertContent().\\" into nyc-mr1-dev am: 03f759e87e
...
am: 176642ec2c
Change-Id: I96395b6e883aa7dd462d1281b6859afa7b324937
2016-06-14 00:52:36 +00:00
Yohei Yukawa
176642ec2c
Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
...
am: 03f759e87e
Change-Id: I7ed048eb980a5b6fa5379756cf4679710c8ce358
2016-06-14 00:38:47 +00:00
Yohei Yukawa
03f759e87e
Merge "Add InputConnection#insertContent()." into nyc-mr1-dev
2016-06-14 00:26:39 +00:00
Yorke Lee
c516cde56d
Merge \\\"Check for detached view in drag-related APIs\\\" into nyc-dev am: cdc9d7bed9 am: 71ab239765
...
am: 23b3de425a
Change-Id: I01b319fc237737ee1f5c323795bc6dc7228a56cc
2016-06-13 22:36:04 +00:00
Yorke Lee
23b3de425a
Merge \\"Check for detached view in drag-related APIs\\" into nyc-dev am: cdc9d7bed9
...
am: 71ab239765
Change-Id: Ie46aaaa63dc9fe9232f6c9fe661b88765f1dd7c8
2016-06-13 22:27:20 +00:00
Yorke Lee
71ab239765
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
...
am: cdc9d7bed9
Change-Id: I95d551726913c95d2806fe22ee93fcc24d1862c2
2016-06-13 22:14:24 +00:00
Yorke Lee
fead52ebf4
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
...
am: cdc9d7bed9
Change-Id: Id1c2228d081e63e86278072654c4c611bdb10d1a
2016-06-13 20:15:15 +00:00