Remove status bar manipulation from EmergencyDialer
Remove the code that prevents the swipe-down from working in the
emergency dialer -- doing it in onResume/onPause seems to be unreliable
and causes the bar to be permanently disabled.
Test: manual
Bug: 63110538
Bug: 62152913
Change-Id: I6a15da1806de6b48a551e49539f09488ef2a7fbf
(cherry picked from commit 1342ffc9965f3424c4cc80f332d0d7f5bb0968c7)
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index fd64ff2..4cbfb38 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -96,8 +96,6 @@
private static final boolean DBG = false;
private static final String LOG_TAG = "EmergencyDialer";
- private StatusBarManager mStatusBarManager;
-
/** The length of DTMF tones in milliseconds */
private static final int TONE_LENGTH_MS = 150;
@@ -175,8 +173,6 @@
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
- mStatusBarManager = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
-
// Allow this activity to be displayed in front of the keyguard / lockscreen.
WindowManager.LayoutParams lp = getWindow().getAttributes();
lp.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
@@ -519,21 +515,11 @@
}
}
- // Disable the status bar and set the poke lock timeout to medium.
- // There is no need to do anything with the wake lock.
- if (DBG) Log.d(LOG_TAG, "disabling status bar, set to long timeout");
- mStatusBarManager.disable(StatusBarManager.DISABLE_EXPAND);
-
updateDialAndDeleteButtonStateEnabledAttr();
}
@Override
public void onPause() {
- // Reenable the status bar and set the poke lock timeout to default.
- // There is no need to do anything with the wake lock.
- if (DBG) Log.d(LOG_TAG, "reenabling status bar and closing the dialer");
- mStatusBarManager.disable(StatusBarManager.DISABLE_NONE);
-
super.onPause();
synchronized (mToneGeneratorLock) {