diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-09-22 15:14:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-22 15:14:49 -0700 |
| commit | 08ee7fa463aee5e83f77789e9a99f17a34ab68b4 (patch) | |
| tree | df130c2f212a2fc7033eeb4fe60ce215a4b297be /core/java | |
| parent | 31b638d40342fc9e3198f9e7f8dffaf55049c9e1 (diff) | |
| parent | ebcd6bb1b9ac5f898621ba25c37f2e3ccd2ff33b (diff) | |
| download | frameworks_base-08ee7fa463aee5e83f77789e9a99f17a34ab68b4.zip frameworks_base-08ee7fa463aee5e83f77789e9a99f17a34ab68b4.tar.gz frameworks_base-08ee7fa463aee5e83f77789e9a99f17a34ab68b4.tar.bz2 | |
Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom
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 4d828c4..e3a4df9 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -936,9 +936,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); |