Merge "DO NOT MERGE Consider fixed layers when scrolling the edit box." into jb-dev
Merge "DO NOT MERGE Consider current scroll position to move text field into view." into jb-dev
Don't clear the functor at every draw

instead clear functors at invoke time, and let them detach themselves as needed.

bug:6511995
Change-Id: I9115fcadffb27eb850c1d1773c098d3d2e22788b
Fix issue #6499411: Characters not displayed (but suggestion bar is working)

The problem was that when dismissing the lock screen, the window manager
would briefly turn off force hiding when it started animating the transition
and then turn it back on until the transition was done.

This would cause it to briefly switch focus to the app behind and then
take focus off it.  The app would find out it got focus, and re-start
input on itself, asking the input method service to do so.  At this
point the input method service would ask the window manager if the
caller really had focus, and it may or may not be told no depending
on the timing.  If it is told no, then it doesn't allow the focus
switch to happen at that point, ignoring the new input connection,
and ultimately when focus does really switch the IME is left talking
with an old dead input connection.

I added some code to the input connection to make sure when we are
no longer using one that we mark it inactive and can't use it.  This
bug was especially difficult to track down because it would only
visibly break when a GC happened during this time, causing the weak
reference on the input connection to become null.  With this change
it will now always break (though in the scenario here only if you
hit the race condition correctly).

Change-Id: I81a6164dc140c548da1a9736e42cd253e8238a80
Merge "Don't clear the functor at every draw" into jb-dev
Merge "Fix issue #6499411: Characters not displayed (but suggestion bar is working)" into jb-dev
Add WPS details for certification

We need to provide device details to the supplicant for WPS 2.0 certification

Bug: 6450363
Change-Id: I3eb8bc75faacf392a43b6ef3085971bd32a675ac
Merge "Status Bar: Register for rotation lock status updates." into jb-dev
Ensure we always set the proper blending mode
Bug #6527305

At the beginning of a frame, always set the blending mode that we
think GL is using just in case it was modified by another entity
(for instance a WebView functor.)

Change-Id: I0e1d0abee8a2abb2b8e7622aed28346e89562c06
Fix ANR which could occur for collection widgets with very large items

-> We cache RemoteViews which populate the AdapterViews, but only
   up to a total memory amount of 2MB. The remainder of the cache
   is pruned out. If _every_ item is greater than 2MB, we were failing
   to prune the last item, leaving the framework in a loop on a bg
   thread, but holding a lock required by the main thread.

Change-Id: I0574a25a59ebec6586ae223fff6605c0fee953c3
Always reference injector using get method.

Bug: 6535301
Change-Id: If1d55c3229603d12c568213bd2f271c7cb6ab139
Add temporary functor lifetime logging

bug:6535911

Change-Id: Ida5cc1def7fe1fc314317bbc5df50e1465753deb
Merge "Ensure we always set the proper blending mode Bug #6527305" into jb-dev
Merge "Add temporary functor lifetime logging" into jb-dev
Merge "Fix ANR which could occur for collection widgets with very large items" into jb-dev
BigPicture notifications for screenshots.

Needed a little extra help from the builder to make this
happen (like the title, you might want a different largeIcon
in the expanded view if---as in this case---it is redundant
with the big picture).

Needed to fix BigPicture template to reveal actions.

Bug: 6289107
Change-Id: I19dc62e693ee2c87cbe82f7327fe9115768b4102
Merge "Add WPS details for certification" into jb-dev
Merge "Always reference injector using get method." into jb-dev
Pull showStrictModeViolation off of local threads.

By moving the StrictModeViolation display onto the WindowManager
Handler we avoid potential deadlocks as found in the bug below.

Fixes bug 6537798.

Change-Id: Ia46a43d1f7f6e55256f770b9e196602092669b49
AudioManager: restore setBluetoothA2dpOn() method

Remove deprecation on setBluetoothA2dpOn() method so that applications
can override the default audio policy which is to use A2DP
for media whenever connected.

The request is not persistent and the default policy is restored when a
new A2DP i ro wired headset connection occurs.

Bug 6485897.

Change-Id: I2a4b6b6bdba55f7b133e64f86d27c03eb86acfa4