Adam Lesinski
b5c8a98b76
Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37
...
am: ce71c120df
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
2016-06-22 19:27:30 +00:00
Adam Lesinski
a72a6aae37
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
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
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
Dianne Hackborn
c0b583d4d6
Merge \\\"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\\" into nyc-dev am: a62a7eef24 am: 56197c9e9e
...
am: 2d1788828f
2016-06-22 17:35:40 +00:00
Dianne Hackborn
2d1788828f
Merge \\"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am: a62a7eef24
...
am: 56197c9e9e
2016-06-22 17:24:25 +00:00
Jason Monk
4519b87423
Merge \\\"QS Tiles: Fix some problems with connecting through intent\\\" into nyc-dev am: 126088536d am: a5076ef7fa
...
am: 8f21a99bfa
2016-06-22 17:18:52 +00:00
Dianne Hackborn
56197c9e9e
Merge \"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
...
am: a62a7eef24
2016-06-22 17:18:38 +00:00
Dianne Hackborn
3f19c95ec5
Merge \"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
...
am: a62a7eef24
2016-06-22 17:18:29 +00:00
Dianne Hackborn
a62a7eef24
Merge "Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag..." into nyc-dev
2016-06-22 17:12:09 +00:00
Jason Monk
8f21a99bfa
Merge \\"QS Tiles: Fix some problems with connecting through intent\\" into nyc-dev am: 126088536d
...
am: a5076ef7fa
2016-06-22 17:10:34 +00:00
Jason Monk
a5076ef7fa
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
...
am: 126088536d
2016-06-22 16:54:06 +00:00
Jason Monk
d8aa42f3e2
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
...
am: 126088536d
2016-06-22 16:53:58 +00:00
Jason Monk
8753e184f9
QS Tiles: Fix some problems with connecting through intent
...
- Don't send Tile through intent, it can cause crashes
- Clean up other issues surrounding this
Change-Id: I08c626cf39b36d349592c1e0b81627b9bc7eeeb3
Fixes: 29519485
2016-06-22 10:52:58 -04:00
Dianne Hackborn
121e1645d1
Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...
...isn't respected if previous job was scheduled with same URI
Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07:00
Calvin On
2e540390ec
Merge \\"Guard concurrent accesses to BluetoothA2dp service object\\" into nyc-mr1-dev am: 30ec4f2732
...
am: 1fef349549
2016-06-22 02:44:20 +00:00
Calvin On
1fef349549
Merge \"Guard concurrent accesses to BluetoothA2dp service object\" into nyc-mr1-dev
...
am: 30ec4f2732
2016-06-22 02:38:11 +00:00
Calvin On
d7d16b9f37
Guard concurrent accesses to BluetoothA2dp service object
...
This fixes potential NPEs that happen on methods that access
mService after checking nullness, i.e. getConnectedDevices.
Bug: 29514788
Change-Id: Ic97054fd5a3563a374c0e863fb116c52535a6509
2016-06-22 01:08:03 +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
Makoto Onuki
02f355df6b
Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp
...
am: 24c52732d7
2016-06-22 00:55:32 +00: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
Marie Janssen
e55a3669a8
Merge \\\\"Fix links to Bluetooth Guide\\\\" am: 6ba39e5642 am: 51f620d98d am: 30975ad80b
...
am: fb0ee69ad0
2016-06-22 00:12:21 +00:00
Robert Carr
538b49b85f
Merge \\\"Don\\\'t try and resolve WRAP_CONTENT too early.\\\" into nyc-dev am: 72ce991692 am: 5a35355364
...
am: b964f26d7a
2016-06-22 00:12:18 +00:00
Yorke Lee
c502ca33ed
Merge \\\"Tweaks to DragAndDropPermissions behavior\\\" into nyc-dev am: 22faa5ddb1 am: 072ce0c29c
...
am: bf18ee7b76
2016-06-21 23:56:51 +00:00
Chad Brubaker
7ba3f0cafe
Merge \\\"Add getApplicationConfigForPackage\\\" into nyc-dev am: abe85d3886 am: 0f1b7d3b3d
...
am: 7103211d6b
2016-06-21 23:56:28 +00:00
Makoto Onuki
5665a66b44
Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev
...
am: 3c67b3e47c
2016-06-21 23:50:32 +00:00
Marie Janssen
fb0ee69ad0
Merge \\\"Fix links to Bluetooth Guide\\\" am: 6ba39e5642 am: 51f620d98d
...
am: 30975ad80b
2016-06-21 23:40:28 +00:00
Robert Carr
b964f26d7a
Merge \\"Don\\'t try and resolve WRAP_CONTENT too early.\\" into nyc-dev am: 72ce991692
...
am: 5a35355364
2016-06-21 23:40:26 +00:00
Yorke Lee
bf18ee7b76
Merge \\"Tweaks to DragAndDropPermissions behavior\\" into nyc-dev am: 22faa5ddb1
...
am: 072ce0c29c
2016-06-21 23:37:51 +00:00
Chad Brubaker
7103211d6b
Merge \\"Add getApplicationConfigForPackage\\" into nyc-dev am: abe85d3886
...
am: 0f1b7d3b3d
2016-06-21 23:37:41 +00:00
Android Build Merger (Role)
d74f7e7362
Merge "Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev am: 72ce991692" into nyc-mr1-dev
2016-06-21 23:37:12 +00:00
Android Build Merger (Role)
4d46efc084
Merge "Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev am: 22faa5ddb1" into nyc-mr1-dev
2016-06-21 23:37:00 +00:00
Android Build Merger (Role)
9de968daed
Merge "Merge \"Add getApplicationConfigForPackage\" into nyc-dev am: abe85d3886" into nyc-mr1-dev
2016-06-21 23:36:02 +00:00
Makoto Onuki
3c67b3e47c
Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev
2016-06-21 23:35:16 +00:00
Robert Carr
d748b54615
Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev
...
am: 72ce991692
2016-06-21 23:35:11 +00:00
Yorke Lee
d22536666a
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
...
am: 22faa5ddb1
2016-06-21 23:35:09 +00:00
Chad Brubaker
b375228afe
Merge \"Add getApplicationConfigForPackage\" into nyc-dev
...
am: abe85d3886
2016-06-21 23:35:00 +00:00
John Reck
ab1080c4d0
Delete unused args
...
Bug: 21170575
Change-Id: Icc832f70f206342557f44667ad3498405d04db78
2016-06-21 16:24:20 -07:00
Makoto Onuki
b5a012fd6f
Shortcut Manager: Address API council feedback and fix TODOs
...
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088
Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
2016-06-21 14:42:48 -07:00
Marie Janssen
30975ad80b
Merge \\"Fix links to Bluetooth Guide\\" am: 6ba39e5642
...
am: 51f620d98d
2016-06-21 21:38:25 +00:00
Marie Janssen
51f620d98d
Merge \"Fix links to Bluetooth Guide\"
...
am: 6ba39e5642
2016-06-21 21:34:13 +00:00
Robert Carr
5a35355364
Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev
...
am: 72ce991692
2016-06-21 21:30:53 +00:00
TreeHugger Robot
72ce991692
Merge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev
2016-06-21 21:24:02 +00:00
Yorke Lee
072ce0c29c
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
...
am: 22faa5ddb1
2016-06-21 21:20:11 +00:00
