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

Commit d5ac081e authored by LuK1337's avatar LuK1337 Committed by Gerrit Code Review
Browse files

SystemUI: Disable SystemUI tuner toggle 

* Currently we use SystemUI Tuner for /Status Bar icons/
  link in CMParts. Disabling it simply makes CMParts crash
  when trying to switch to that preference.

Change-Id: Id2e3d31a75a097e0a92029eb61803699d9c51308
parent 895b9b57

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

+1 −2
Original line number Diff line number Diff line
@@ -304,8 +304,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
        mEmergencyOnly.setVisibility(mExpanded && mShowEmergencyCallsOnly

                ? View.VISIBLE : View.INVISIBLE);

        mSettingsContainer.setVisibility(mExpanded ? View.VISIBLE : View.INVISIBLE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(

                TunerService.isTunerEnabled(mContext) ? View.VISIBLE : View.INVISIBLE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(View.INVISIBLE);

        mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers()

                ? View.VISIBLE : View.INVISIBLE);

    }

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

+1 −8
Original line number Diff line number Diff line
@@ -58,15 +58,8 @@ public class SettingsButton extends AlphaOptimizedImageButton { 
    @Override

    public boolean onTouchEvent(MotionEvent event) {

        switch (event.getActionMasked()) {

            case MotionEvent.ACTION_DOWN:

                postDelayed(mLongPressCallback, LONG_PRESS_LENGTH);

                break;

            case MotionEvent.ACTION_UP:

                if (mUpToSpeed) {

                    startExitAnimation();

                } else {

                cancelLongClick();

                }

                break;

            case MotionEvent.ACTION_CANCEL:

                cancelLongClick();

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

+1 −2
Original line number Diff line number Diff line
@@ -386,8 +386,7 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC 
        }

        mEmergencyCallsOnly.setVisibility(mExpanded && mShowEmergencyCallsOnly ? VISIBLE : GONE);

        mBatteryLevel.setVisibility(mExpanded ? View.VISIBLE : View.GONE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(

                TunerService.isTunerEnabled(mContext) ? View.VISIBLE : View.INVISIBLE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(View.INVISIBLE);

    }



    private void updateSignalClusterDetachment() {

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

+0 −5
Original line number Diff line number Diff line
@@ -93,11 +93,6 @@ public class TunerFragment extends PreferenceFragment { 
        MetricsLogger.visibility(getContext(), MetricsEvent.TUNER, false);

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        menu.add(Menu.NONE, MENU_REMOVE, Menu.NONE, R.string.remove_from_settings);

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        switch (item.getItemId()) {