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

Commit f3c91331 authored by Altaf-Mahdi's avatar Altaf-Mahdi Committed by Steve Kondik
Browse files

Quick settings: Option to disable brightness slider (1/2) 

also fixed ripple placement for dual tiles

before:
https://www.dropbox.com/s/r4m1ytiwbdbj1xw/Screenshot_2015-01-12-21-29-55.png?dl=0

after:
https://www.dropbox.com/s/lvswhsubux548xh/Screenshot_2015-01-12-21-27-31.png?dl=0



Signed-off-by: default avatarAltaf-Mahdi <altaf.mahdi@gmail.com>

Change-Id: I98a28e99e78ee4d8bb4f03bc53e867723d62b052
parent 151e0321

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -2101,6 +2101,12 @@ public final class Settings { 
         */

        public static final String STATUS_BAR_QUICK_QS_PULLDOWN = "status_bar_quick_qs_pulldown";



        /** Whether to show the brightness slider in quick settings panel.

         *

         * @hide

         */

        public static final String QS_SHOW_BRIGHTNESS_SLIDER = "qs_show_brightness_slider";



        /**

         * List of QS tile names

         * @hide

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+21 −2
Original line number Diff line number Diff line
@@ -119,6 +119,25 @@ public class QSPanel extends ViewGroup { 
        });

    }



    /**

     * Enable/disable brightness slider.

     */

    private boolean showBrightnessSlider() {

        boolean brightnessSliderEnabled = Settings.System.getIntForUser(

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

                1, UserHandle.USER_CURRENT) == 1;

        ToggleSlider brightnessSlider = (ToggleSlider) findViewById(R.id.brightness_slider);

        if (brightnessSliderEnabled) {

            mBrightnessView.setVisibility(VISIBLE);

            brightnessSlider.setVisibility(VISIBLE);

        } else {

            mBrightnessView.setVisibility(GONE);

            brightnessSlider.setVisibility(GONE);

        }

        updateResources();

        return brightnessSliderEnabled;

    }



    private void updateDetailText() {

        mDetailDoneButton.setText(R.string.quick_settings_done);

        mDetailSettingsButton.setText(R.string.quick_settings_more_settings);
@@ -201,7 +220,7 @@ public class QSPanel extends ViewGroup { 
        if (mListening) {

            refreshAllTiles();

        }

        if (listening) {

        if (listening && showBrightnessSlider()) {

            mBrightnessController.registerCallbacks();

        } else {

            mBrightnessController.unregisterCallbacks();
@@ -399,7 +418,7 @@ public class QSPanel extends ViewGroup { 
                tileRecord.tileView.setVisibility(newVis);

            }

        }

        mBrightnessView.setVisibility(newVis);

        mBrightnessView.setVisibility(showBrightnessSlider() ? newVis : GONE);

        mGridContentVisible = visible;

    }

packages/SystemUI/src/com/android/systemui/qs/QSTileView.java

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ public class QSTileView extends ViewGroup { 
    private void updateRippleSize(int width, int height) {

        // center the touch feedback on the center of the icon, and dial it down a bit

        final int cx = width / 2;

        final int cy = mDual ? mIcon.getTop() + mIcon.getHeight() / 2 : height / 2;

        final int cy = mDual ? mIcon.getTop() + mIcon.getHeight() : height / 2;

        final int rad = (int)(mIcon.getHeight() * 1.25f);

        mRipple.setHotspotBounds(cx - rad, cy - rad, cx + rad, cy + rad);

    }