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

* commit 'de974f6f201a9aed3f811c97edf4db3ecd41eb3d':
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 "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
audio service fix dock after crash - DO NOT MERGE

merge from master:
"audio service: set dock use on mediaserver restart

Restore forced usage of dock audio for media according to
current setting when media server restarts."

Bug 7485250.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
AudioService: undock audio glitch - DO NOT MERGE

merge from master:

"AudioService: improve low end dock audio control

Low end docks have a menu to enable use of audio
for media: automatically enabling/disabling use of audio
when the dock is connected/disconnected is useless
and can be the source of audio glitches.

Bug 7463620."

Change-Id: I3b7e7ebe660bb3f0e4367d2a3ed63ee76f78fe58
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.
Reconcile with jb-mr1-release - do not merge

Change-Id: I5b5f12f167d5a0287dfd21c8f37f0f451c9242a4
Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev
Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev
am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev

* commit 'c717d110ae5c2531a75420386f99ad8957732dbf':
  Fix keyguard measurement bugs
am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev

* commit '3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
  Fixing up glowpad scaling issues (issue 7494378)
am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev

* commit 'fd8c388f028de046e5f5ed36880e98f67e6bb481':
  Fix bug where newly added widget wasn't always shown
am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev

* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
  Implement fallback clock in keyguard
am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev

* commit 'cd1f3095056bd4148030f6f6c514387d623db800':
  Slide unlock cannot get accessibility focus.
am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev

* commit '5da893c93b55c83b07558a1648f53dfec89b1f32':
  Add one more check for detecting crashes while inflating multiuser widget
am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev

* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
  Fixing up overscroll asset / sizing
am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev

* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev

* commit '5c533884ead3bb8a8e2e4e8d79587a81dbe31700':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev

* commit '3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
  Attempt to fix NegativeArraySizeException crash in keyguard
am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev

* commit 'd8e2fdf7345f448f332ea8a551172f48563f77aa':
  Use stable layouts for keyguard/SlidingChallengeLayout