SystemUI : Port forward statusbar brightness control (3ba09bd4) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -2035,6 +2035,13 @@ public final class Settings {
		*/
		public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1;

		/**
		* Whether to control brightness from status bar
		*
		* @hide
		*/
		public static final String STATUS_BAR_BRIGHTNESS_CONTROL = "status_bar_brightness_control";

		/**
		* Control whether the process CPU usage meter should be shown.
		*

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

+161 −4

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import android.app.Notification;
		import android.app.PendingIntent;
		import android.app.StatusBarManager;
		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		@@ -70,9 +71,11 @@ import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.IPowerManager;
		import android.os.Message;
		import android.os.PowerManager;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.provider.Settings;
		@@ -89,10 +92,12 @@ import android.view.Gravity;
		import android.view.HardwareCanvas;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.HapticFeedbackConstants;
		import android.view.MotionEvent;
		import android.view.VelocityTracker;
		import android.view.View;
		import android.view.View.OnClickListener;
		import android.view.ViewConfiguration;
		import android.view.ViewGroup;
		import android.view.ViewGroup.LayoutParams;
		import android.view.ViewPropertyAnimator;
		@@ -228,6 +233,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
		.build();

		private static final float BRIGHTNESS_CONTROL_PADDING = 0.15f;
		private static final int BRIGHTNESS_CONTROL_LONG_PRESS_TIMEOUT = 750; // ms
		private static final int BRIGHTNESS_CONTROL_LINGER_THRESHOLD = 20;

		public static final int FADE_KEYGUARD_START_DELAY = 100;
		public static final int FADE_KEYGUARD_DURATION = 300;

		@@ -356,6 +365,15 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		int[] mAbsPos = new int[2];
		ArrayList<Runnable> mPostCollapseRunnables = new ArrayList<>();

		private boolean mBrightnessControl;
		private boolean mBrightnessChanged;
		private float mScreenWidth;
		private int mMinBrightness;
		private boolean mJustPeeked;
		int mLinger;
		int mInitialTouchX;
		int mInitialTouchY;

		// for disabling the status bar
		int mDisabled = 0;

		@@ -371,6 +389,45 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		private int mNavigationIconHints = 0;

		Runnable mLongPressBrightnessChange = new Runnable() {
		@Override
		public void run() {
		mStatusBarView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
		adjustBrightness(mInitialTouchX);
		mLinger = BRIGHTNESS_CONTROL_LINGER_THRESHOLD + 1;
		}
		};

		class SettingsObserver extends ContentObserver {
		SettingsObserver(Handler handler) {
		super(handler);
		}

		void observe() {
		ContentResolver resolver = mContext.getContentResolver();
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL), false, this);
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.SCREEN_BRIGHTNESS_MODE), false, this);
		update();
		}

		@Override
		public void onChange(boolean selfChange) {
		update();
		}

		public void update() {
		ContentResolver resolver = mContext.getContentResolver();
		boolean autoBrightness = Settings.System.getInt(
		resolver, Settings.System.SCREEN_BRIGHTNESS_MODE, 0) ==
		Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
		mBrightnessControl = !autoBrightness && Settings.System.getInt(
		resolver, Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 1) == 1;
		}
		}


		// 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()) {
		@@ -595,6 +652,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		addNavigationBar();

		SettingsObserver observer = new SettingsObserver(mHandler);
		observer.observe();

		// Lastly, call to the icon policy to install/update all the icons.
		mIconPolicy = new PhoneStatusBarPolicy(mContext, mCastController);
		mSettingsObserver.onChange(false); // set up
		@@ -632,6 +692,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		Resources res = context.getResources();

		mScreenWidth = (float) context.getResources().getDisplayMetrics().widthPixels;
		mMinBrightness = context.getResources().getInteger(
		com.android.internal.R.integer.config_screenBrightnessDim);

		updateDisplaySize(); // populates mDisplayMetrics
		updateResources();

		@@ -2535,6 +2599,76 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		disable(mDisabledUnmodified, true /* animate */);
		}

		private void adjustBrightness(int x) {
		mBrightnessChanged = true;
		float raw = ((float) x) / mScreenWidth;

		// Add a padding to the brightness control on both sides to
		// make it easier to reach min/max brightness
		float padded = Math.min(1.0f - BRIGHTNESS_CONTROL_PADDING,
		Math.max(BRIGHTNESS_CONTROL_PADDING, raw));
		float value = (padded - BRIGHTNESS_CONTROL_PADDING) /
		(1 - (2.0f * BRIGHTNESS_CONTROL_PADDING));

		int newBrightness = mMinBrightness + (int) Math.round(value *
		(android.os.PowerManager.BRIGHTNESS_ON - mMinBrightness));
		newBrightness = Math.min(newBrightness, android.os.PowerManager.BRIGHTNESS_ON);
		newBrightness = Math.max(newBrightness, mMinBrightness);

		try {
		IPowerManager power = IPowerManager.Stub.asInterface(
		ServiceManager.getService("power"));
		if (power != null) {
		power.setTemporaryScreenBrightnessSettingOverride(newBrightness);
		Settings.System.putInt(mContext.getContentResolver(),
		Settings.System.SCREEN_BRIGHTNESS, newBrightness);
		}
		} catch (RemoteException e) {
		Log.w(TAG, "Setting Brightness failed: " + e);
		}
		}

		private void brightnessControl(MotionEvent event) {
		final int action = event.getAction();
		final int x = (int) event.getRawX();
		final int y = (int) event.getRawY();
		if (action == MotionEvent.ACTION_DOWN) {
		if (y < mStatusBarHeaderHeight) {
		mLinger = 0;
		mInitialTouchX = x;
		mInitialTouchY = y;
		mJustPeeked = true;
		mHandler.removeCallbacks(mLongPressBrightnessChange);
		mHandler.postDelayed(mLongPressBrightnessChange,
		BRIGHTNESS_CONTROL_LONG_PRESS_TIMEOUT);
		}
		} else if (action == MotionEvent.ACTION_MOVE) {
		if (y < mStatusBarHeaderHeight && mJustPeeked) {
		if (mLinger > BRIGHTNESS_CONTROL_LINGER_THRESHOLD) {
		adjustBrightness(x);
		} else {
		final int xDiff = Math.abs(x - mInitialTouchX);
		final int yDiff = Math.abs(y - mInitialTouchY);
		final int touchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop();
		if (xDiff > yDiff) {
		mLinger++;
		}
		if (xDiff > touchSlop \|\| yDiff > touchSlop) {
		mHandler.removeCallbacks(mLongPressBrightnessChange);
		}
		}
		} else {
		if (y > mStatusBarHeaderHeight) {
		mJustPeeked = false;
		}
		mHandler.removeCallbacks(mLongPressBrightnessChange);
		}
		} else if (action == MotionEvent.ACTION_UP
		\|\| action == MotionEvent.ACTION_CANCEL) {
		mHandler.removeCallbacks(mLongPressBrightnessChange);
		}
		}

		public boolean interceptTouchEvent(MotionEvent event) {
		if (DEBUG_GESTURES) {
		if (event.getActionMasked() != MotionEvent.ACTION_MOVE) {
		@@ -2560,16 +2694,40 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mGestureRec.add(event);
		}

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

		final boolean upOrCancel =
		event.getAction() == MotionEvent.ACTION_UP \|\|
		event.getAction() == MotionEvent.ACTION_CANCEL;
		if (mStatusBarWindowState == WINDOW_STATE_SHOWING) {
		if (upOrCancel && !mExpandedVisible) {
		setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
		} else {
		setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);
		}
		}
		if (mBrightnessChanged && upOrCancel) {
		mBrightnessChanged = false;
		if (mJustPeeked) {
		/**
		* if we were just peeking, eat the event and collapse the status bar, otherwise
		* the event gets passed down and a full expand might happen.
		*/
		mNotificationPanel.fling(10, false);
		if (mExpandedVisible) {
		mExpandedVisible = false;
		visibilityChanged(false);
		setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
		}
		disable(mDisabledUnmodified, true /* animate */);
		return true;
		}
		}
		return false;
		}

		@@ -3367,7 +3525,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		mCarrierLabelHeight = res.getDimensionPixelSize(R.dimen.carrier_label_height);
		mStatusBarHeaderHeight = res.getDimensionPixelSize(R.dimen.status_bar_header_height);

		mNotificationPanelMinHeightFrac = res.getFraction(R.dimen.notification_panel_min_height_frac, 1, 1);
		if (mNotificationPanelMinHeightFrac < 0f \|\| mNotificationPanelMinHeightFrac > 1f) {
		mNotificationPanelMinHeightFrac = 0f;