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.
Merge commit 'adda0c0fb04a828a71aba1bffa20689427b972bd'
* commit 'adda0c0fb04a828a71aba1bffa20689427b972bd':
Allow dock keep screen on to select between AC and USB power.
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.
Merge commit 'ad12b1407b4f615765bca0f496ccbb0a11678a4f'
* commit 'ad12b1407b4f615765bca0f496ccbb0a11678a4f':
Support for forcing accelerometer based orientation management when docked.
Merge commit '655ec0dc07e1978879336ac7adbf638a7f8fc85e'
* commit '655ec0dc07e1978879336ac7adbf638a7f8fc85e':
Add ability to keep screen on while docked.
Merge commit 'e2c7e560807907b8002b5d61402a7bfa95b02411'
* commit 'e2c7e560807907b8002b5d61402a7bfa95b02411':
Tweak the lock screen date format to be like "Fri, Sep 18, 2009".
Merge commit 'bdefdbe2890627130463c08d2c7838463729c59b'
* commit 'bdefdbe2890627130463c08d2c7838463729c59b':
Policy changes for lock screen on live wallpaper.
Merge commit 'a53ed86dfcdfd4bc9e7003558ed64650da101042'
* commit 'a53ed86dfcdfd4bc9e7003558ed64650da101042':
Show a message about silent mode being toggled after user rotates widget to left.
Merge commit '23d153cf0d17762cee81984b7adf2009a40dc5c6'
* commit '23d153cf0d17762cee81984b7adf2009a40dc5c6':
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
Merge commit '323034827f9673df17481397a35aceba382a1e4e'
* commit '323034827f9673df17481397a35aceba382a1e4e':
First pass at pattern lock screen that includes date / time and carrier info (andoid.policy portion)
Merge commit 'e39a8dbd6b0c4249d9ecbf35f9999d1e4764457c'
* commit 'e39a8dbd6b0c4249d9ecbf35f9999d1e4764457c':
Allow specifying separate orientation rotations for car and desk dock.
Merge commit '4925591c7308b79140b45f9edf7f9c71976a8fcc'
* commit '4925591c7308b79140b45f9edf7f9c71976a8fcc':
Add rotary based lock screen, and only show security pattern screen when pattern is set.
