diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-09-21 16:25:33 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-09-21 17:39:23 -0700 |
| commit | ebcd6bb1b9ac5f898621ba25c37f2e3ccd2ff33b (patch) | |
| tree | 26ea49460e8e5c4d1d0e9d683a1f2e0a2aff62ad /core | |
| parent | 22aa7805dd0d9bf1c31b5cff526fda793477d8a7 (diff) | |
| download | frameworks_base-ebcd6bb1b9ac5f898621ba25c37f2e3ccd2ff33b.zip frameworks_base-ebcd6bb1b9ac5f898621ba25c37f2e3ccd2ff33b.tar.gz frameworks_base-ebcd6bb1b9ac5f898621ba25c37f2e3ccd2ff33b.tar.bz2 | |
Fixing emergency dialer flicker on lock screen (issue 5314293)
Change-Id: Ia9bf4acb84923e200b89ee55fc53bc92877001cf
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 6 | ||||
| -rw-r--r-- | core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml | 3 |
2 files changed, 6 insertions, 3 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); diff --git a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml index 07b4837..dd29164 100644 --- a/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout-sw600dp/keyguard_screen_tab_unlock_land.xml @@ -80,7 +80,8 @@ android:layout_alignParentBottom="true" android:drawableLeft="@drawable/ic_emergency" style="@style/Widget.Button.Transparent" - android:drawablePadding="8dip"/> + android:drawablePadding="8dip" + android:visibility="gone"/> </RelativeLayout>> |