Merge "Stop enabling all disabled status bar features from GlobalActions." (b545851d) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/GlobalActions.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.internal.policy.impl;

		import android.app.Activity;
		import android.app.AlertDialog;
		import android.app.StatusBarManager;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.DialogInterface;
		@@ -57,8 +56,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac

		private static final String TAG = "GlobalActions";

		private StatusBarManager mStatusBar;

		private final Context mContext;
		private final AudioManager mAudioManager;

		@@ -103,13 +100,12 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
		mKeyguardShowing = keyguardShowing;
		mDeviceProvisioned = isDeviceProvisioned;
		if (mDialog == null) {
		mStatusBar = (StatusBarManager)mContext.getSystemService(Context.STATUS_BAR_SERVICE);
		mDialog = createDialog();
		}
		prepareDialog();

		mStatusBar.disable(StatusBarManager.DISABLE_EXPAND);
		mDialog.show();
		mDialog.getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_DISABLE_EXPAND);
		}

		/**
		@@ -249,7 +245,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac

		/** {@inheritDoc} */
		public void onDismiss(DialogInterface dialog) {
		mStatusBar.disable(StatusBarManager.DISABLE_NONE);
		}

		/** {@inheritDoc} */