Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit a7a6ca17 authored by Danesh Mondegarian's avatar Danesh Mondegarian Committed by Michael Bestas
Browse files

SystemUI : Port forward statusbar brightness control 



Brings back the status bar brightness control from cm-10.2/cm-11

Change-Id: Icc04e7da3286e9925f8b90528c1e022b33d33e9d

SystemUI: improve brightness slider behavior

Mimic the brightness slider behavior in the statusbar.
This adds logic to make the statusbar slider also work with automatic
brightness mode enabled and it will instead adjust the temporary automatic
brightness overrride.

Change-Id: I78814a785decc83df94844fcc2f489c8cbec2b65
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>

SystemUI: status bar brightness: store value as int

Non-automatic brightness value is stored as int, not float.

Symptom: adjust the brightness in the status bar, the brightness
         slider in the notification bar will always be set to full

Change-Id: I5f9a6e97bae2c44c3aff7c9222186a6dbda5d902
parent 21d3f68d

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -2820,6 +2820,13 @@ public final class Settings { 
         */

        public static final String BUTTON_BACKLIGHT_TIMEOUT = "button_backlight_timeout";



        /**

         * 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/settings/BrightnessController.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class BrightnessController implements ToggleSlider.Listener { 
     * {@link android.provider.Settings.System#SCREEN_AUTO_BRIGHTNESS_ADJ} uses the range [-1, 1].

     * Using this factor, it is converted to [0, BRIGHTNESS_ADJ_RESOLUTION] for the SeekBar.

     */

    private static final float BRIGHTNESS_ADJ_RESOLUTION = 2048;

    public static final float BRIGHTNESS_ADJ_RESOLUTION = 2048;



    private static final int MSG_UPDATE_ICON = 0;

    private static final int MSG_UPDATE_SLIDER = 1;

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

+189 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN; 
import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;

import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;

import static android.app.StatusBarManager.windowStateToString;

import static com.android.systemui.settings.BrightnessController.BRIGHTNESS_ADJ_RESOLUTION;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT;

import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE;
@@ -79,6 +80,7 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.IPowerManager;

import android.os.Message;

import android.os.PowerManager;

import android.os.Process;
@@ -104,9 +106,11 @@ import android.view.Display; 
import android.view.IRotationWatcher;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.HapticFeedbackConstants;

import android.view.MotionEvent;

import android.view.ThreadedRenderer;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.ViewGroup;

import android.view.ViewGroup.LayoutParams;

import android.view.ViewGroup.MarginLayoutParams;
@@ -149,6 +153,7 @@ import com.android.systemui.recents.ScreenPinningRequest; 
import com.android.systemui.recents.events.EventBus;

import com.android.systemui.recents.events.activity.AppTransitionFinishedEvent;

import com.android.systemui.recents.events.activity.UndockingTaskEvent;

import com.android.systemui.settings.BrightnessController;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.stackdivider.WindowManagerProxy;

import com.android.systemui.statusbar.ActivatableNotificationView;
@@ -258,6 +263,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;

    public static final int FADE_KEYGUARD_DURATION_PULSING = 96;
@@ -400,6 +409,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 


    private int mNavigationBarWindowState = WINDOW_STATE_SHOWING;



    private int mStatusBarHeaderHeight;



    // the tracker view

    int mTrackingPosition; // the position of the top of the tracking view.
@@ -409,6 +420,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    int[] mAbsPos = new int[2];

    ArrayList<Runnable> mPostCollapseRunnables = new ArrayList<>();



    private boolean mAutomaticBrightness;

    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 mDisabled1 = 0;

    int mDisabled2 = 0;
@@ -433,6 +454,46 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    private int mNavigationIconHints = 0;

    private HandlerThread mHandlerThread;



    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();

            int mode = Settings.System.getIntForUser(mContext.getContentResolver(),

                            Settings.System.SCREEN_BRIGHTNESS_MODE,

                            Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL,

                            UserHandle.USER_CURRENT);

            mAutomaticBrightness = mode != Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;

            mBrightnessControl = Settings.System.getInt(

                    resolver, Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 0) == 1;

        }

    }



    class DevForceNavbarObserver extends ContentObserver {

        DevForceNavbarObserver(Handler handler) {

            super(handler);
@@ -775,6 +836,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            // no window manager? good luck with that

        }



        SettingsObserver observer = new SettingsObserver(mHandler);

        observer.observe();



        // Lastly, call to the icon policy to install/update all the icons.

        mIconPolicy = new PhoneStatusBarPolicy(mContext, mIconController, mCastController,

                mHotspotController, mUserInfoController, mBluetoothController,
@@ -819,6 +883,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    protected PhoneStatusBarView makeStatusBarView() {

        final Context context = mContext;



        mScreenWidth = (float) context.getResources().getDisplayMetrics().widthPixels;

        mMinBrightness = context.getResources().getInteger(

                com.android.internal.R.integer.config_screenBrightnessDim);



        updateDisplaySize(); // populates mDisplayMetrics

        updateResources();
@@ -3049,6 +3117,98 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        }

    }



    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));

        try {

            IPowerManager power = IPowerManager.Stub.asInterface(

                    ServiceManager.getService("power"));

            if (power != null) {

                if (mAutomaticBrightness) {

                    float adj = (value * 100) / (BRIGHTNESS_ADJ_RESOLUTION / 2f) - 1;

                    adj = Math.max(adj, -1);

                    adj = Math.min(adj, 1);

                    final float val = adj;

                    power.setTemporaryScreenAutoBrightnessAdjustmentSettingOverride(val);

                    AsyncTask.execute(new Runnable() {

                        public void run() {

                            Settings.System.putFloatForUser(mContext.getContentResolver(),

                                    Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, val,

                                    UserHandle.USER_CURRENT);

                        }

                    });

                } else {

                    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);

                    final int val = newBrightness;

                    power.setTemporaryScreenBrightnessSettingOverride(val);

                    AsyncTask.execute(new Runnable() {

                        @Override

                        public void run() {

                            Settings.System.putIntForUser(mContext.getContentResolver(),

                                    Settings.System.SCREEN_BRIGHTNESS, val,

                                    UserHandle.USER_CURRENT);

                        }

                    });

                }





            }

        } 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) {
@@ -3075,16 +3235,40 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mGestureRec.add(event);

        }



        if (mStatusBarWindowState == WINDOW_STATE_SHOWING) {

        if (mBrightnessControl) {

            brightnessControl(event);

            if ((mDisabled1 & 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(mDisabledUnmodified1, mDisabledUnmodified2, true /* animate */);

                return true;

            }

        }

        return false;

    }
@@ -3840,6 +4024,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mMaxAllowedKeyguardNotifications = res.getInteger(

                R.integer.keyguard_max_notification_count);



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



        if (DEBUG) Log.v(TAG, "defineSlots");

    }