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

Commit 3b0f892c authored by Muyuan Li's avatar Muyuan Li
Browse files

sysui: refactor for extensibility. 

1. Refactor the interfaces of the slider out side the ToggleSlider class.
2. BrightnessController now takes in only an IToggleSlider interface instead of
   the view.

Bug: 28172423
Change-Id: Iff463a30e149f17795ccaffca66040d64f44a643
(cherry picked from commit 89c0cb853175c66769d287b8d6cf82c7166e0e6e)
parent e16137ca

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:contentDescription="@null"

        android:visibility="gone" />



    <com.android.systemui.settings.ToggleSlider

    <com.android.systemui.settings.ToggleSliderView

        android:id="@+id/brightness_slider"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

packages/SystemUI/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        <attr name="keyRepeat" format="boolean" />

        <attr name="android:contentDescription" />

    </declare-styleable>

    <declare-styleable name="ToggleSlider">

    <declare-styleable name="ToggleSliderView">

        <attr name="text" format="string" />

    </declare-styleable>

    <declare-styleable name="NotificationLinearLayout">

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

+5 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.systemui.qs.QSTile.Host.Callback; 
import com.android.systemui.qs.customize.QSCustomizer;

import com.android.systemui.qs.external.CustomTile;

import com.android.systemui.settings.BrightnessController;

import com.android.systemui.settings.ToggleSlider;

import com.android.systemui.settings.ToggleSliderView;

import com.android.systemui.statusbar.phone.QSTileHost;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.tuner.TunerService;
@@ -94,7 +94,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 


        mBrightnessController = new BrightnessController(getContext(),

                (ImageView) findViewById(R.id.brightness_icon),

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

                (ToggleSliderView) findViewById(R.id.brightness_slider));



    }
@@ -158,8 +158,9 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { 


    public void setBrightnessMirror(BrightnessMirrorController c) {

        super.onFinishInflate();

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

        ToggleSlider mirror = (ToggleSlider) c.getMirror().findViewById(R.id.brightness_slider);

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

        ToggleSliderView mirror = (ToggleSliderView) c.getMirror().findViewById(

                R.id.brightness_slider);

        brightnessSlider.setMirror(mirror);

        brightnessSlider.setMirrorController(c);

    }

packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ public class BrightnessController implements ToggleSlider.Listener { 
    }



    @Override

    public void onChanged(ToggleSlider view, boolean tracking, boolean automatic, int value,

            boolean stopTracking) {

    public void onChanged(ToggleSlider toggleSlider, boolean tracking, boolean automatic,

            int value, boolean stopTracking) {

        updateIcon(mAutomatic);

        if (mExternalChange) return;

packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class BrightnessDialog extends Activity { 
        setContentView(R.layout.quick_settings_brightness_dialog);



        final ImageView icon = (ImageView) findViewById(R.id.brightness_icon);

        final ToggleSlider slider = (ToggleSlider) findViewById(R.id.brightness_slider);

        final ToggleSliderView slider = (ToggleSliderView) findViewById(R.id.brightness_slider);

        mBrightnessController = new BrightnessController(this, icon, slider);

    }