Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE

Browse Source 
* commit '08a8f3f9dc035bc462061ae87090a8da59c6713a':
  Set emergency call text visibility.
This commit is contained in:
John Wang
2011-06-08 20:41:41 -07:00
committed by Android Git Automerger
parent 60ee24fe48 08a8f3f9dc
commit 4d04204824
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -35,6 +35,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import java.io.File;
import java.io.FileNotFoundException;
@@ -869,6 +870,18 @@ public class LockPatternUtils {
button.setText(textId);
}
/**
* Sets the visibility of emergency call prompt based on emergency capable
* @param emergencyText the emergency call text to be updated
*/
public void updateEmergencyCallText(TextView emergencyText) {
if (isEmergencyCallCapable()) {
emergencyText.setVisibility(View.VISIBLE);
} else {
emergencyText.setVisibility(View.GONE);
}
}
/**
* Resumes a call in progress. Typically launched from the EmergencyCall button
* on various lockscreens.

11
policy/src/com/android/internal/policy/impl/LockScreen.java
View File

@@ -538,7 +538,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen,
// layout
mScreenLocked.setVisibility(View.VISIBLE);
mEmergencyCallText.setVisibility(View.VISIBLE);
mLockPatternUtils.updateEmergencyCallText(mEmergencyCallText);
enableUnlock(); // do not need to show the e-call button; user may unlock
break;
@@ -552,8 +552,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen,
// layout
mScreenLocked.setVisibility(View.VISIBLE);
mEmergencyCallText.setVisibility(View.VISIBLE);
mEmergencyCallButton.setVisibility(View.VISIBLE);
mLockPatternUtils.updateEmergencyCallText(mEmergencyCallText);
mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton);
disableUnlock();
break;
@@ -579,14 +579,13 @@ class LockScreen extends LinearLayout implements KeyguardScreen,
mScreenLocked.setText(R.string.lockscreen_sim_puk_locked_instructions);
// layout
mLockPatternUtils.updateEmergencyCallText(mEmergencyCallText);
mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton);
if (mLockPatternUtils.isPukUnlockScreenEnable()) {
mScreenLocked.setVisibility(View.INVISIBLE);
mEmergencyCallText.setVisibility(View.GONE);
enableUnlock();
} else {
mScreenLocked.setVisibility(View.VISIBLE);
mEmergencyCallText.setVisibility(View.VISIBLE);
mEmergencyCallButton.setVisibility(View.VISIBLE);
disableUnlock();
}
break;