This came down to a decision; if we want to show other information (owner id, current playing song, etc.)
as well as continue to have an easy way to silence the device, we need to have two unlock screens in these cases.
We simply don't have enough room on these screens to show anything but the unlock widget and a small bit of text.
This change *does not* affect pattern unlock, which will continue to be a single unlock screen.
Merge commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70'
* commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70':
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
Merge commit 'f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31' into eclair-plus-aosp
* commit 'f2be271d1dd84d09ee55041d61ac9b2b4ed4ba31':
Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
Added explicit TextView.setColor() to workaround bug with TextView.setSelected().
Merge commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1' into eclair-plus-aosp
* commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1':
Workaround for a keyguard problem that appeared in the in call screen.
Merge commit 'a3b4a8111c47852e212032008732e143636151e4' into eclair-plus-aosp
* commit 'a3b4a8111c47852e212032008732e143636151e4':
Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
For bug 2352904, lockscreen need clearly show "Emergency Calls Only" status no matter with SIM status.
The change is to show both SIM card status and carrier PLMN including "Emergency Calls Only" status.
Merge commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501'
* commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501':
Do not turn off screen immediately after undocking.
While in call, pressing the power key to turn off the screen caused the Home button
to no longer work after rewaking the screen due to the KeyguardViewMediator mHidden flag not being set.
Change-Id: I322317671b2e5e32de23ed524f6e4808b0334c12
BUG: 2382766
Signed-off-by: Mike Lockwood <lockwood@android.com>
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent. Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.
Instead, we'll handle this separately in lockscreen.
Merge commit '5b2151ae8654f63bd25e05e87f872ec6f78f0519' into eclair-plus-aosp
* commit '5b2151ae8654f63bd25e05e87f872ec6f78f0519':
Do not turn off screen immediately after undocking.
Adding a SAML account to the system would cause the current test to fail because it expected to have
only one account on the system. Instead, ensure that the device has at lease one non-SAML account.
Fixed update bug where having a single SAML account still showed the "Forgot pattern" button.
Tested:
- Wipe device and add pattern lock
- Add SAML account, verify "forgot pattern" doesn't appear.
- Add GAIA account, verify "forgot pattern" appears.
- Wipe device and add pattern lock
- Add GAIA account, verify "forgot pattern" appears
- Add SAML account, verify "forgot pattern" doesn't go away.
Merge commit 'b728c072e98ee560dc97744c85d914bd550a8a43'
* commit 'b728c072e98ee560dc97744c85d914bd550a8a43':
Add replace flag to a few more broadcasts.
Merge commit 'ab4b6c42d78b3d8230d8b444e301f2691884980e' into eclair-mr2-plus-aosp
* commit 'ab4b6c42d78b3d8230d8b444e301f2691884980e':
Add replace flag to a few more broadcasts.
Merge commit 'beae79dfcac8ba09069a80b4f129feb8b585b480'
* commit 'beae79dfcac8ba09069a80b4f129feb8b585b480':
Move emergency call button to top-right when no SIM.
Merge commit '97467c6fd99f67bb0a7024533ea8cc1626c41ac8' into eclair-mr2-plus-aosp
* commit '97467c6fd99f67bb0a7024533ea8cc1626c41ac8':
Move emergency call button to top-right when no SIM.
Also allows lockscreen's toasts to restore the previous text
in the status TextView, which is necessary for this UI. Also
added color to the toasts (another UI ask).
In conjunction with change Ifea65fb9.
http://b/2260798
Merge commit '2d7f59319ad81139b826dff79e97cf7263832014'
* commit '2d7f59319ad81139b826dff79e97cf7263832014':
Fix issue #2302336: System dialogs are not being given a layer
Merge commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84'
* commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84':
Do not show keyguard if screen is turned off by proximity sensor.
Merge commit '3e5eceb93ccdb00296e96154cbc0491a5516538b' into eclair-mr2-plus-aosp
* commit '3e5eceb93ccdb00296e96154cbc0491a5516538b':
Fix issue #2302336: System dialogs are not being given a layer
Merge commit '57932798cf11d72e656fd6e315b83e2c571cd129' into eclair-mr2-plus-aosp
* commit '57932798cf11d72e656fd6e315b83e2c571cd129':
Do not show keyguard if screen is turned off by proximity sensor.
