Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev (ec9b13dc) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,11 @@ public class PanelBar extends FrameLayout {
		// figure out which panel needs to be talked to here
		if (event.getAction() == MotionEvent.ACTION_DOWN) {
		final PanelView panel = selectPanelForTouchX(event.getX());
		LOG("PanelBar.onTouch: state=%d ACTION_DOWN: panel %s", mState, panel);
		boolean enabled = panel.isEnabled();
		LOG("PanelBar.onTouch: state=%d ACTION_DOWN: panel %s %s", mState, panel,
		(enabled ? "" : " (disabled)"));
		if (!enabled)
		return false;
		startOpeningPanel(panel);
		}
		final boolean result = mTouchingPanel.getHandle().dispatchTouchEvent(event);

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

+36 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.graphics.Canvas;
		import android.graphics.ColorFilter;
		import android.graphics.PixelFormat;
		@@ -39,6 +40,7 @@ import android.graphics.Rect;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.NinePatchDrawable;
		import android.inputmethodservice.InputMethodService;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Message;
		import android.os.RemoteException;
		@@ -259,6 +261,26 @@ public class PhoneStatusBar extends BaseStatusBar {
		}
		};

		// ensure quick settings is disabled until the current user makes it through the setup wizard
		private boolean mUserSetup = false;
		private ContentObserver mUserSetupObserver = new ContentObserver(new Handler()) {
		@Override
		public void onChange(boolean selfChange) {
		final boolean userSetup = 0 != Settings.Secure.getIntForUser(
		mContext.getContentResolver(),
		Settings.Secure.USER_SETUP_COMPLETE,
		0 /default /,
		mCurrentUserId);
		if (userSetup != mUserSetup) {
		mUserSetup = userSetup;
		if (mSettingsPanel != null)
		mSettingsPanel.setEnabled(mUserSetup);
		if (!mUserSetup && mStatusBarView != null)
		animateCollapseQuickSettings();
		}
		}
		};

		@Override
		public void start() {
		mDisplay = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE))
		@@ -461,6 +483,9 @@ public class PhoneStatusBar extends BaseStatusBar {
		filter.addAction(Intent.ACTION_SCREEN_ON);
		context.registerReceiver(mBroadcastReceiver, filter);

		// listen for USER_SETUP_COMPLETE setting (per-user)
		resetUserSetupObserver();

		return mStatusBarView;
		}

		@@ -1827,6 +1852,16 @@ public class PhoneStatusBar extends BaseStatusBar {
		if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId);
		animateCollapsePanels();
		updateNotificationIcons();
		resetUserSetupObserver();
		}

		private void resetUserSetupObserver() {
		mContext.getContentResolver().unregisterContentObserver(mUserSetupObserver);
		mUserSetupObserver.onChange(false);
		mContext.getContentResolver().registerContentObserver(
		Settings.Secure.getUriFor(Settings.Secure.USER_SETUP_COMPLETE), true,
		mUserSetupObserver,
		mCurrentUserId);
		}

		private void setIntruderAlertVisibility(boolean vis) {