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

Commit 97127033 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable tuner"

parents 6e97afc1 f87aba0a

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

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import com.android.systemui.Interpolators; 


public class SettingsButton extends AlphaOptimizedImageButton {



    private static final boolean TUNER_ENABLE_AVAILABLE = false;



    private static final long LONG_PRESS_LENGTH = 1000;

    private static final long ACCEL_LENGTH = 750;

    private static final long FULL_SPEED_LENGTH = 375;
@@ -59,7 +61,7 @@ public class SettingsButton extends AlphaOptimizedImageButton { 
    public boolean onTouchEvent(MotionEvent event) {

        switch (event.getActionMasked()) {

            case MotionEvent.ACTION_DOWN:

                postDelayed(mLongPressCallback, LONG_PRESS_LENGTH);

                if (TUNER_ENABLE_AVAILABLE) postDelayed(mLongPressCallback, LONG_PRESS_LENGTH);

                break;

            case MotionEvent.ACTION_UP:

                if (mUpToSpeed) {

packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class TunerServiceImpl extends TunerService { 


    private static final String TUNER_VERSION = "sysui_tuner_version";



    private static final int CURRENT_TUNER_VERSION = 1;

    private static final int CURRENT_TUNER_VERSION = 2;



    private final Observer mObserver = new Observer();

    // Map of Uris we listen on to their settings keys.
@@ -116,6 +116,9 @@ public class TunerServiceImpl extends TunerService { 
                        TextUtils.join(",", iconBlacklist), mCurrentUser);

            }

        }

        if (oldVersion < 2) {

            setTunerEnabled(mContext, false);

        }

        setValue(TUNER_VERSION, newVersion);

    }