Merge "Always disable() through SBMS; watch date." (b0d89922) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -1174,7 +1174,6 @@ public class PhoneStatusBar extends StatusBar {
		case MSG_OPEN_RECENTS_PANEL:
		if (DEBUG) Slog.d(TAG, "opening recents panel");
		if (mRecentsPanel != null) {
		disable(StatusBarManager.DISABLE_BACK);
		mRecentsPanel.setVisibility(View.VISIBLE);
		mRecentsPanel.show(true, true);
		}
		@@ -1182,7 +1181,6 @@ public class PhoneStatusBar extends StatusBar {
		case MSG_CLOSE_RECENTS_PANEL:
		if (DEBUG) Slog.d(TAG, "closing recents panel");
		if (mRecentsPanel != null && mRecentsPanel.isShowing()) {
		disable(StatusBarManager.DISABLE_NONE);
		mRecentsPanel.show(false, true);
		}
		break;

+6 −7

Original line number	Diff line number	Diff line
		@@ -22,11 +22,9 @@ import android.content.Intent;
		import android.content.IntentFilter;
		import android.text.format.DateFormat;
		import android.util.AttributeSet;
		import android.util.Slog;
		import android.widget.TextView;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewParent;
		import android.widget.TextView;

		import com.android.systemui.R;

		@@ -42,9 +40,10 @@ public final class DateView extends TextView {
		private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();
		if (action.equals(Intent.ACTION_TIME_TICK)
		\|\| action.equals(Intent.ACTION_TIMEZONE_CHANGED)) {
		final String action = intent.getAction();
		if (Intent.ACTION_TIME_TICK.equals(action)
		\|\| Intent.ACTION_TIME_CHANGED.equals(action)
		\|\| Intent.ACTION_TIMEZONE_CHANGED.equals(action)) {
		updateClock();
		}
		}
		@@ -118,6 +117,7 @@ public final class DateView extends TextView {
		// Register for Intent broadcasts for the clock and battery
		IntentFilter filter = new IntentFilter();
		filter.addAction(Intent.ACTION_TIME_TICK);
		filter.addAction(Intent.ACTION_TIME_CHANGED);
		filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
		mContext.registerReceiver(mIntentReceiver, filter, null, null);
		updateClock();
		@@ -127,4 +127,3 @@ public final class DateView extends TextView {
		}
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -301,6 +301,7 @@ public class TabletStatusBar extends StatusBar implements
		mRecentsPanel = (RecentsPanelView) View.inflate(context,
		R.layout.status_bar_recent_panel, null);
		mRecentsPanel.setVisibility(View.GONE);
		mRecentsPanel.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
		mRecentsPanel.setOnTouchListener(new TouchOutsideListener(MSG_CLOSE_RECENTS_PANEL,
		mRecentsPanel));
		mStatusBarView.setIgnoreChildren(2, mRecentButton, mRecentsPanel);
		@@ -705,7 +706,6 @@ public class TabletStatusBar extends StatusBar implements
		case MSG_OPEN_RECENTS_PANEL:
		if (DEBUG) Slog.d(TAG, "opening recents panel");
		if (mRecentsPanel != null) {
		disable(StatusBarManager.DISABLE_BACK);
		mRecentsPanel.setVisibility(View.VISIBLE);
		mRecentsPanel.show(true, true);
		}
		@@ -713,7 +713,6 @@ public class TabletStatusBar extends StatusBar implements
		case MSG_CLOSE_RECENTS_PANEL:
		if (DEBUG) Slog.d(TAG, "closing recents panel");
		if (mRecentsPanel != null && mRecentsPanel.isShowing()) {
		disable(StatusBarManager.DISABLE_NONE);
		mRecentsPanel.show(false, true);
		}
		break;

+6 −3

Original line number	Diff line number	Diff line
		@@ -1202,12 +1202,15 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		// showing secure lockscreen; disable expanding.
		flags \|= StatusBarManager.DISABLE_EXPAND;
		}
		if (isSecure()) {
		// showing secure lockscreen; disable ticker.
		flags \|= StatusBarManager.DISABLE_NOTIFICATION_TICKER;
		}
		}

		if (DEBUG) {
		Log.d(TAG,
		"adjustStatusBarLocked: mShowing=" + mShowing + " mHidden=" + mHidden
		+ " isSecure=" + isSecure() + " --> flags=" + flags);
		Log.d(TAG, "adjustStatusBarLocked: mShowing=" + mShowing + " mHidden=" + mHidden
		+ " isSecure=" + isSecure() + " --> flags=0x" + Integer.toHexString(flags));
		}

		mStatusBarManager.disable(flags);

+1 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub
		// also allows calls from window manager which is in this process.
		enforceStatusBarService();

		if (SPEW) Slog.d(TAG, "setSystemUiVisibility(" + vis + ")");
		if (SPEW) Slog.d(TAG, "setSystemUiVisibility(0x" + Integer.toHexString(vis) + ")");

		synchronized (mLock) {
		updateUiVisibilityLocked(vis);