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

Commit a05ba1fc authored by Oliver Scott's avatar Oliver Scott Committed by Michael Bestas
Browse files

fixup! SystemUI: Add quick settings pull down with one finger 

Issue: calyxos#3134
Change-Id: I47cd94d821a46604e06aaab2c450478b38501d43
parent 71dff9ba

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java

+9 −4
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import android.graphics.Insets; 
import android.graphics.Rect;

import android.graphics.Rect;

import android.graphics.Region;

import android.graphics.Region;

import android.os.Handler;

import android.os.Handler;

import android.os.UserHandle;

import android.util.IndentingPrintWriter;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.Log;

import android.util.MathUtils;

import android.util.MathUtils;
@@ -104,6 +105,7 @@ import com.android.systemui.statusbar.phone.ShadeTouchableRegionManager; 
import com.android.systemui.statusbar.policy.CastController;

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

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

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

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

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

import com.android.systemui.user.domain.interactor.SelectedUserInteractor;

import com.android.systemui.util.LargeScreenUtils;

import com.android.systemui.util.LargeScreenUtils;

import com.android.systemui.util.kotlin.JavaAdapter;

import com.android.systemui.util.kotlin.JavaAdapter;
@@ -348,7 +350,8 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum 
            CastController castController,

            CastController castController,

            SplitShadeStateController splitShadeStateController,

            SplitShadeStateController splitShadeStateController,

            Lazy<CommunalTransitionViewModel> communalTransitionViewModelLazy,

            Lazy<CommunalTransitionViewModel> communalTransitionViewModelLazy,

            Lazy<LargeScreenHeaderHelper> largeScreenHeaderHelperLazy

            Lazy<LargeScreenHeaderHelper> largeScreenHeaderHelperLazy,

            SelectedUserInteractor selectedUserInteractor

    ) {

    ) {

        SceneContainerFlag.assertInLegacyMode();

        SceneContainerFlag.assertInLegacyMode();

        mPanelViewControllerLazy = panelViewControllerLazy;

        mPanelViewControllerLazy = panelViewControllerLazy;
@@ -402,9 +405,10 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum 
        mOneFingerQuickSettingsInterceptObserver = new ContentObserver(null) {

        mOneFingerQuickSettingsInterceptObserver = new ContentObserver(null) {

            @Override

            @Override

            public void onChange(boolean selfChange) {

            public void onChange(boolean selfChange) {

                mOneFingerQuickSettingsIntercept = LineageSettings.System.getInt(

                mOneFingerQuickSettingsIntercept = LineageSettings.System.getIntForUser(

                        mPanelView.getContext().getContentResolver(),

                        mPanelView.getContext().getContentResolver(),

                        LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 0);

                        LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 0,

                        selectedUserInteractor.getSelectedUserId());

            }

            }

        };

        };
@@ -2286,7 +2290,8 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum 
            mPanelView.getContext().getContentResolver().registerContentObserver(

            mPanelView.getContext().getContentResolver().registerContentObserver(

                    LineageSettings.System.getUriFor(

                    LineageSettings.System.getUriFor(

                            LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN),

                            LineageSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN),

                    false, mOneFingerQuickSettingsInterceptObserver);

                    false, mOneFingerQuickSettingsInterceptObserver,

                    UserHandle.USER_ALL);

            mOneFingerQuickSettingsInterceptObserver.onChange(true);

            mOneFingerQuickSettingsInterceptObserver.onChange(true);

            updateExpansion();

            updateExpansion();

        }

        }