Merge "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." into jb-mr1-dev

Patrick Brady · Android (Google) Code Review · commit 957b27f62b5d · 2012-10-11T23:04:34.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,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,`