Revert "Always show emergency button on selector view screen in keyguard." I'm reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I'll handle re-adding it if needed.

Patrick Brady · Android (Google) Code Review · commit b6a1ea78b8c9 · 2012-10-11T21:09:14.000-07:00
This reverts commit 43c5b55 Change-Id: I2289658d3afaea9d1655b1811f49435de6c130e1
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,9 +109,7 @@ 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.
-                
-                // XXX we decided to show this always.  See bug 7276760
-                enabled = true || mLockPatternUtils.isSecure();
+                enabled = mLockPatternUtils.isSecure();
             }
         }
         mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled,

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,7 @@ 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`		`-`
`113`		`- // XXX we decided to show this always. See bug 7276760`
`114`		`- enabled = true \|\| mLockPatternUtils.isSecure();`
	`112`	`+ enabled = mLockPatternUtils.isSecure();`
`115`	`113`	`}`
`116`	`114`	`}`
`117`	`115`	`mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled,`