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

Merge "Stop enabling all disabled status bar features from GlobalActions."

Browse Source
This commit is contained in:
Daniel Sandler
2011-10-11 12:01:15 -07:00
committed by Android (Google) Code Review
parent 0c9698aca5 d27a0cb96e
commit b545851dd5
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
policy/src/com/android/internal/policy/impl/GlobalActions.java
View File

@@ -18,7 +18,6 @@ package com.android.internal.policy.impl;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.StatusBarManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -57,8 +56,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
private static final String TAG = "GlobalActions"; private static final String TAG = "GlobalActions";
private StatusBarManager mStatusBar;
private final Context mContext; private final Context mContext;
private final AudioManager mAudioManager; private final AudioManager mAudioManager;
@@ -103,13 +100,12 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
mKeyguardShowing = keyguardShowing; mKeyguardShowing = keyguardShowing;
mDeviceProvisioned = isDeviceProvisioned; mDeviceProvisioned = isDeviceProvisioned;
if (mDialog == null) { if (mDialog == null) {
mStatusBar = (StatusBarManager)mContext.getSystemService(Context.STATUS_BAR_SERVICE);
mDialog = createDialog(); mDialog = createDialog();
} }
prepareDialog(); prepareDialog();
mStatusBar.disable(StatusBarManager.DISABLE_EXPAND);
mDialog.show(); mDialog.show();
mDialog.getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_DISABLE_EXPAND);
} }
/** /**
@@ -249,7 +245,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
/** {@inheritDoc} */ /** {@inheritDoc} */
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
mStatusBar.disable(StatusBarManager.DISABLE_NONE);
} }
/** {@inheritDoc} */ /** {@inheritDoc} */