Merge commit 'c759ed684857a085e5cf74f5a62bc98e78abd660'
* commit 'c759ed684857a085e5cf74f5a62bc98e78abd660':
fw/policy/base:Phonewindowmanager: Make vkey button haptics part of global haptic setting
Merge commit '7833c22d43dc5abbbfff500b641e31897996d265'
* commit '7833c22d43dc5abbbfff500b641e31897996d265':
Fix volume key handling when in-call and screen is off due to proximity sensor.
Merge commit '9e22bd9ab0b51370a3b2c3ea9b8263ca44548a9b'
* commit '9e22bd9ab0b51370a3b2c3ea9b8263ca44548a9b':
Remove keyguard view after a delay instead of just hiding it.
Merge commit '2d52a18c872c1cada6a2e6b482cc14fd7b91424c'
* commit '2d52a18c872c1cada6a2e6b482cc14fd7b91424c':
Whoops, count down text is not updating... fixed!
Merge commit 'f5107ee3f24a28174ba13eee2b731a5be5c28fc0'
* commit 'f5107ee3f24a28174ba13eee2b731a5be5c28fc0':
Tweak LockScreen to make use of landscape layout.
The delay should make sure the animation works, and by still removing it, we
preserve the initialization logic that depends on being reinstantiated each time
the screen turns off. The logic could be adjusted to work without this, but
seems safer to maintain the existing behavior. Also reduces risk from having
keyguard around all the time.
Merge commit 'adda0c0fb04a828a71aba1bffa20689427b972bd'
* commit 'adda0c0fb04a828a71aba1bffa20689427b972bd':
Allow dock keep screen on to select between AC and USB power.
It looks like there may have been a race when restoring that would allow
you to show the menu before it is restored. I couldn't repro on my current
device before the fix, though.
Change-Id: I624e1306871344d3ee39f69dde832b3db2530a5f
Merge commit '6b2309f8dfeac86b825a688d48b20e12782fe135'
* commit '6b2309f8dfeac86b825a688d48b20e12782fe135':
Fixes and improvements to lock screen hiding, dock launching.
- Implement new window flags for dismissing non-secure lock screens.
- Implement launching of docks from the home key.
Change-Id: If29f299db47e3759c3e146983f59d0f86ed22c4c
- The window flag to hide the lock screen will now allow you to press home,
and automatically dismiss the lock screen if it is not needed for security.
- When opening the lid, if the lock screen will be shown, try to avoid
turning on the screen until it is ready. There is actually still some
problem with this.
Change-Id: I51d769b8e6cff7b439b1ffea927c0a01376427b1
Merge commit 'ca1a265cc3a44590b685cad2d5d081565c684d83'
* commit 'ca1a265cc3a44590b685cad2d5d081565c684d83':
Dock event overrides SCREEN_ORIENTATION_NOSENSOR so Home will rotate in the car dock.
For UI interface consistency with airplane mode change from setting menu,
an ECM exit dialog should also be shown up when user wants to change airplane
mode in ECM after long key pressing power key. Then based on the user's choice to change
airplane mode. i.e. press Yes to exit ECM and turn on airplane mode or press No
to keep ECM and do not change airplane mode.
Change-Id: I0fe7e5cdeec0f33852615b491b75f65a46257590
Merge commit 'e5b98a7c1df63670e9183d9a4cb59ba37f710b92'
* commit 'e5b98a7c1df63670e9183d9a4cb59ba37f710b92':
Show silent mode toast immediately, and for 3.5 seconds instead of 2.
Merge commit 'fa3414a7d313fd1f4bc80cf2fd42fbdb33908197'
* commit 'fa3414a7d313fd1f4bc80cf2fd42fbdb33908197':
Don't show battery info when unplugging (fixes bug 2128323).
Merge commit '33c29f9691e584a0fd37266381ccd47e2ac3c197'
* commit '33c29f9691e584a0fd37266381ccd47e2ac3c197':
Show silent mode icon associated with current state instead of what it will be.
