Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev

Jim Miller · Android (Google) Code Review · commit fdb6be8b1f76 · 2012-10-11T18:21:13.000-07:00
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java b/policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java
@@ -109,7 +109,9 @@ private void updateEmergencyCallButton(State simState, int phoneState) {
             } else {
                 // True if we need to show a secure screen (pin/pattern/SIM pin/SIM puk);
                 // hides emergency button on "Slide" screen if device is not secure.
-                enabled = mLockPatternUtils.isSecure();
+                
+                // XXX we decided to show this always.  See bug 7276760
+                enabled = true || mLockPatternUtils.isSecure();
             }
         }
         mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled,

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,9 @@ private void updateEmergencyCallButton(State simState, int phoneState) {`
`109`	`109`	`} else {`
`110`	`110`	`// True if we need to show a secure screen (pin/pattern/SIM pin/SIM puk);`
`111`	`111`	`// hides emergency button on "Slide" screen if device is not secure.`
`112`		`- enabled = mLockPatternUtils.isSecure();`
	`112`	`+`
	`113`	`+ // XXX we decided to show this always. See bug 7276760`
	`114`	`+ enabled = true \|\| mLockPatternUtils.isSecure();`
`113`	`115`	`}`
`114`	`116`	`}`
`115`	`117`	`mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled,`