Alan Viverette
59d045e7a0
Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am: 22f887a014 am: 483a8dc097
...
am: 23f6f62ea4
2016-06-23 01:12:46 +00:00
Alan Viverette
23f6f62ea4
Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am: 22f887a014
...
am: 483a8dc097
2016-06-23 01:06:15 +00:00
Alan Viverette
483a8dc097
Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
...
am: 22f887a014
2016-06-23 01:00:18 +00:00
Alan Viverette
22f887a014
Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev
2016-06-23 00:55:52 +00:00
Jim Miller
f0db3158fb
Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641
...
am: 0a7efa1e47
2016-06-23 00:25:06 +00:00
Jim Miller
0a7efa1e47
Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev
...
am: 0520091641
2016-06-23 00:20:57 +00:00
Jim Miller
0520091641
Merge "Enable fingerprint sensor navigation to invoke QuickSettings - rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"" into nyc-mr1-dev
2016-06-23 00:13:42 +00:00
John Reck
3ef67ae4f4
Merge \\\"Change approach for windowPositionLostRT\\\" into nyc-dev am: 16038a0c5f am: fdff97caf0
...
am: c95bebfe39
2016-06-22 23:56:23 +00:00
John Reck
c95bebfe39
Merge \\"Change approach for windowPositionLostRT\\" into nyc-dev am: 16038a0c5f
...
am: fdff97caf0
2016-06-22 23:50:38 +00:00
John Reck
fdff97caf0
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
...
am: 16038a0c5f
2016-06-22 23:45:50 +00:00
John Reck
0a3a75e121
Merge \"Change approach for windowPositionLostRT\" into nyc-dev
...
am: 16038a0c5f
2016-06-22 23:45:34 +00:00
Adam Powell
103bd9bf00
Merge "Clarify Fragment#setUserVisibleHint guarantees in docs"
2016-06-22 23:40:28 +00:00
John Reck
16038a0c5f
Merge "Change approach for windowPositionLostRT" into nyc-dev
2016-06-22 23:38:24 +00:00
John Reck
f23a1b8e4c
Change approach for windowPositionLostRT
...
Bug: 29547000
Instead of shifting the window off screen fall
back to the UI-thread calculated values. This fixes
a race issue around tear-down where we stop
drawing long before our window is actually no longer
visible, as well as fixes a funky issue with
PRESERVE_GEOMETRY during first draw.
Change-Id: I792d1966f5aaee1e703295ae79166c723b97a1dc
2016-06-22 16:10:07 -07:00
Fyodor Kupolov
e4c1812750
Merge \\\"Use granted userId to look up provider info\\\" into nyc-dev am: f9f2c7ceef am: 7bc1db96ed
...
am: d50b61ff36
2016-06-22 22:54:09 +00:00
Fyodor Kupolov
d50b61ff36
Merge \\"Use granted userId to look up provider info\\" into nyc-dev am: f9f2c7ceef
...
am: 7bc1db96ed
2016-06-22 22:47:46 +00:00
Fyodor Kupolov
eb3f3aa46d
Merge \"Use granted userId to look up provider info\" into nyc-dev
...
am: f9f2c7ceef
2016-06-22 22:41:57 +00:00
Fyodor Kupolov
7bc1db96ed
Merge \"Use granted userId to look up provider info\" into nyc-dev
...
am: f9f2c7ceef
2016-06-22 22:41:42 +00:00
Fyodor Kupolov
f9f2c7ceef
Merge "Use granted userId to look up provider info" into nyc-dev
2016-06-22 22:28:38 +00:00
Jim Miller
07e0384a4e
Enable fingerprint sensor navigation to invoke QuickSettings
...
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"
Fixes bug 28869612
Change-Id: I321240ee54506633d63a29e987b8d8638c652391
2016-06-22 15:18:13 -07:00
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
Adam Powell
7f46c1b73f
Clarify Fragment#setUserVisibleHint guarantees in docs
...
Note that setUserVisibleHint can be called from outside of the
fragment lifecycle. Some apps override it and expect otherwise,
and the bug fix for N will affect their expectations.
https://code.google.com/p/android/issues/detail?id=213681
Bug 29526496
Change-Id: I68d5690cefe5f354313f3d89e8ec5ebccaf2544f
2016-06-22 13:30:26 -07: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
e894efa9b6
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
2016-06-22 19:16:44 +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
Adam Lesinski
122cbd1705
Merge \\\"Prevent early boot crash reading PowerProfile\\\" into nyc-dev am: ec6db57ac7 am: 31ef27c249
...
am: 965ed1170b
2016-06-22 17:47:02 +00:00
Adam Lesinski
965ed1170b
Merge \\"Prevent early boot crash reading PowerProfile\\" into nyc-dev am: ec6db57ac7
...
am: 31ef27c249
2016-06-22 17:41:15 +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
31ef27c249
Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
...
am: ec6db57ac7
2016-06-22 17:37:41 +00:00
Adam Lesinski
21ce707021
Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
...
am: ec6db57ac7
2016-06-22 17:37:41 +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
Adam Lesinski
ec6db57ac7
Merge "Prevent early boot crash reading PowerProfile" into nyc-dev
2016-06-22 17:31:35 +00:00
Fyodor Kupolov
9bbaacf845
Use granted userId to look up provider info
...
In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.
Bug: 29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7
2016-06-22 10:31:18 -07:00
Adam Lesinski
1a76a62b8d
Prevent early boot crash reading PowerProfile
...
The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.
Bug:29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
2016-06-22 10:28:47 -07: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
