diff options
author | Jim Miller <jaggies@google.com> | 2010-02-25 21:03:17 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-25 21:03:17 -0800 |
commit | 4d98579f43026a8213b0570e7836648902741005 (patch) | |
tree | 79289e47a452c88934c73c56ce934343d238c832 /core/java | |
parent | 80d27ad33c3722dc62732b842e5cf0b2dd0784dc (diff) | |
parent | 69ac9887459a65a0eebc6f9c450a5b6c2313d713 (diff) | |
download | frameworks_base-4d98579f43026a8213b0570e7836648902741005.zip frameworks_base-4d98579f43026a8213b0570e7836648902741005.tar.gz frameworks_base-4d98579f43026a8213b0570e7836648902741005.tar.bz2 |
Merge "Fix 2336057: Provide a way for the user to return to a call from LockScreen."
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 9713c27..1956b4e 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -17,15 +17,20 @@ package com.android.internal.widget; import android.app.DevicePolicyManager; -import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; +import android.os.RemoteException; +import android.os.ServiceManager; import android.os.SystemClock; import android.provider.Settings; import android.security.MessageDigest; +import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import android.widget.Button; +import com.android.internal.R; +import com.android.internal.telephony.ITelephony; import com.google.android.collect.Lists; import java.io.FileNotFoundException; @@ -675,4 +680,43 @@ public class LockPatternUtils { || (mode == MODE_PIN || mode == MODE_PASSWORD) && savedPasswordExists(); return secure; } + + /** + * Sets the text on the emergency button to indicate what action will be taken. + * If there's currently a call in progress, the button will take them to the call + * @param button the button to update + */ + public void updateEmergencyCallButtonState(Button button) { + int newState = TelephonyManager.getDefault().getCallState(); + int textId; + if (newState == TelephonyManager.CALL_STATE_OFFHOOK) { + // show "return to call" text and show phone icon + textId = R.string.lockscreen_return_to_call; + int phoneCallIcon = R.drawable.stat_sys_phone_call; + button.setCompoundDrawablesWithIntrinsicBounds(phoneCallIcon, 0, 0, 0); + } else { + textId = R.string.lockscreen_emergency_call; + int emergencyIcon = R.drawable.ic_emergency; + button.setCompoundDrawablesWithIntrinsicBounds(emergencyIcon, 0, 0, 0); + } + button.setText(textId); + } + + /** + * Resumes a call in progress. Typically launched from the EmergencyCall button + * on various lockscreens. + * + * @return true if we were able to tell InCallScreen to show. + */ + public boolean resumeCall() { + ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone")); + try { + if (phone != null && phone.showCallScreen()) { + return true; + } + } catch (RemoteException e) { + // What can we do? + } + return false; + } } |