Merge "Fix status bar brightness control when on secure lock screen" into cm-10.2 (5b3e2588) · Commits · e / os / android_frameworks_base

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

+43 −41

Original line number	Diff line number	Diff line
		@@ -290,7 +290,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		CustomTheme mCurrentTheme;
		private boolean mRecreating = false;

		private boolean mBrightnessControl = true;
		private boolean mBrightnessControl;
		private float mScreenWidth;
		private int mMinBrightness;
		int mLinger;
		@@ -788,8 +788,6 @@ public class PhoneStatusBar extends BaseStatusBar {
		// listen for USER_SETUP_COMPLETE setting (per-user)
		resetUserSetupObserver();

		mVelocityTracker = VelocityTracker.obtain();

		return mStatusBarView;
		}

		@@ -2113,10 +2111,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		}
		}

		private void brightnessControl(MotionEvent event)
		{
		if (mBrightnessControl)
		{
		private void brightnessControl(MotionEvent event) {
		final int action = event.getAction();
		final int x = (int) event.getRawX();
		final int y = (int) event.getRawY();
		@@ -2124,6 +2119,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		mLinger = 0;
		mInitialTouchX = x;
		mInitialTouchY = y;
		mVelocityTracker = VelocityTracker.obtain();
		mHandler.removeCallbacks(mLongPressBrightnessChange);
		if ((y) < mNotificationHeaderHeight) {
		mHandler.postDelayed(mLongPressBrightnessChange,
		@@ -2151,11 +2147,12 @@ public class PhoneStatusBar extends BaseStatusBar {
		}
		} else if (action == MotionEvent.ACTION_UP
		\|\| action == MotionEvent.ACTION_CANCEL) {
		mVelocityTracker.recycle();
		mVelocityTracker = null;
		mHandler.removeCallbacks(mLongPressBrightnessChange);
		mLinger = 0;
		}
		}
		}

		public boolean interceptTouchEvent(MotionEvent event) {
		if (DEBUG_GESTURES) {
		@@ -2182,8 +2179,6 @@ public class PhoneStatusBar extends BaseStatusBar {
		mGestureRec.add(event);
		}

		brightnessControl(event);

		// Cling (first-run help) handling.
		// The cling is supposed to show the first time you drag, or even tap, the status bar.
		// It should show the notification panel, then fade in after half a second, giving you
		@@ -2199,6 +2194,13 @@ public class PhoneStatusBar extends BaseStatusBar {
		hideCling();
		}

		if (mBrightnessControl) {
		brightnessControl(event);
		if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) {
		return true;
		}
		}

		return false;
		}