OSDN Git Service

Fix 2336057: Provide a way for the user to return to a call from LockScreen.
authorJim Miller <jaggies@google.com>
Wed, 24 Feb 2010 23:37:00 +0000 (15:37 -0800)
committerJim Miller <jaggies@google.com>
Fri, 26 Feb 2010 05:04:58 +0000 (21:04 -0800)
commit3261cc5d8e56026c1fea90267ed4eac715b4acb2
tree136d3bb611880422e32edd583857b8c58204673b
parent2cf49f3f14aaf9b0633c6e11ed9da5f5f6005f61
Fix 2336057: Provide a way for the user to return to a call from LockScreen.

This makes the "Emergency call" button dual-purpose. If there's a call in progress,
the button will show "Return to call" and take them back to the call.
phone/com/android/internal/policy/impl/AccountUnlockScreen.java
phone/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
phone/com/android/internal/policy/impl/LockPatternKeyguardView.java
phone/com/android/internal/policy/impl/LockScreen.java
phone/com/android/internal/policy/impl/PasswordUnlockScreen.java
phone/com/android/internal/policy/impl/PatternUnlockScreen.java
phone/com/android/internal/policy/impl/SimUnlockScreen.java