diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-09-22 23:39:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 23:39:33 -0700 |
| commit | a0c7a5765dbbd255f9a122ba8829ca44032acde0 (patch) | |
| tree | 944fbf406e36ebc8342189982b1059d364c370aa /core/java | |
| parent | 83227a2d067abd4b276289f62dc126dc3174ee10 (diff) | |
| parent | 08ee7fa463aee5e83f77789e9a99f17a34ab68b4 (diff) | |
| download | frameworks_base-a0c7a5765dbbd255f9a122ba8829ca44032acde0.zip frameworks_base-a0c7a5765dbbd255f9a122ba8829ca44032acde0.tar.gz frameworks_base-a0c7a5765dbbd255f9a122ba8829ca44032acde0.tar.bz2 | |
am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom
* commit '08ee7fa463aee5e83f77789e9a99f17a34ab68b4':
Fixing emergency dialer flicker on lock screen (issue 5314293)
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 76550cf..19dc42b 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -947,9 +947,11 @@ public class LockPatternUtils { * * If there's currently a call in progress, the button will take them to the call * @param button the button to update + * @param showIfCapable indicates whether the button should be shown if emergency calls are + * possible on the device */ - public void updateEmergencyCallButtonState(Button button) { - if (isEmergencyCallCapable()) { + public void updateEmergencyCallButtonState(Button button, boolean showIfCapable) { + if (isEmergencyCallCapable() && showIfCapable) { button.setVisibility(View.VISIBLE); } else { button.setVisibility(View.GONE); |