am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev

* commit 'eb6cbc22b264af26a20065942899a27abbc867eb':
am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev

* commit 'de974f6f201a9aed3f811c97edf4db3ecd41eb3d':
Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
Support Wifi display devices that rename themselves.

Some Wifi display devices like to rename themselves after a
connection completes (or at other times).  Make sure to update
the name of the display when we detect that it changed in
our scan results.

This problem is somewhat complicated by the fact that we remember
the display name persistently, so we need to update our list
of remembered displays too.

Improve the state machine to avoid redundant attempts to
disconnect or cancel connection.

Bug: 7478895
Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
Merge "Don't handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
Fiddle with keyguard glowpad layouts

Also add hierarchyviewer support for KeyguardSecurityView LayoutParams

Bug 7497272
Bug 7459668

Change-Id: I5d03751571d0af66f4c9d08a9d9ca476b32735ac
Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
Adding workaround to fix issue where the bouncer animation had the wrong pivot.

Change-Id: I500fb765cf206b97cc0b585c195cc647cc8e63f1
Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
Compress lockscreen's account login fallback to fit.

 - ECA will not be shown in this mode
 - The login button shares a row with the password field

Nice and tidy.

Bug: 7456674
Change-Id: I38d04dcb7ee32d0b289f03f9e8dcbe38ba23a119
Merge "Don't cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev

* commit '3fe2cb4db60827889abd1f971910f807ae346488':
  Don't cancel any notifications that are meant for all users, if no package is specified.
Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
Clean up some flashy jank (issue 7454766)

Change-Id: I809f3afbbb70e82847aa4851d20058a2c483a32e
Synchronizing bouncer duration with page scaling duration.

Change-Id: I9fba381582a083ce2ab26375698c5a6f3d554a1b
Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev
Disable interactive mode for full-screen security views in keyguard.

Change-Id: Ied038ba96ba3a6e6f6b4bd25a4c5be74814596fe
add bouncer frame to glowpad.

Bug: 7497916
Change-Id: I6bddbfc91c89b0855eba0dcec46bc1b88684b8ad
Keyguard - force showing the status bar

Change-Id: I168293497a829346ba6f9566370c418ef1a09f8f