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

Commit 58789f6c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Updating SysUI state when back enabled/disabled state change" into rvc-dev am: d71e76fd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11965840

Change-Id: I45773b216a2b93a3b0e1955eedccc497e1c12cd1
parents 4064cfb4 d71e76fd

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

+15 −3
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 


    private final Context mContext;

    private final OverviewProxyService mOverviewProxyService;

    private final Runnable mStateChangeCallback;



    private final PluginManager mPluginManager;

    // Activities which should not trigger Back gesture.

    private final List<ComponentName> mGestureBlockingActivities = new ArrayList<>();
@@ -196,13 +198,15 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
            };



    public EdgeBackGestureHandler(Context context, OverviewProxyService overviewProxyService,

            SysUiState sysUiFlagContainer, PluginManager pluginManager) {

            SysUiState sysUiFlagContainer, PluginManager pluginManager,

            Runnable stateChangeCallback) {

        super(Dependency.get(BroadcastDispatcher.class));

        mContext = context;

        mDisplayId = context.getDisplayId();

        mMainExecutor = context.getMainExecutor();

        mOverviewProxyService = overviewProxyService;

        mPluginManager = pluginManager;

        mStateChangeCallback = stateChangeCallback;

        ComponentName recentsComponentName = ComponentName.unflattenFromString(

                context.getString(com.android.internal.R.string.config_recentsComponentName));

        if (recentsComponentName != null) {
@@ -226,13 +230,13 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
                Log.e(TAG, "Failed to add gesture blocking activities", e);

            }

        }

        Dependency.get(ProtoTracer.class).add(this);



        Dependency.get(ProtoTracer.class).add(this);

        mLongPressTimeout = Math.min(MAX_LONG_PRESS_TIMEOUT,

                ViewConfiguration.getLongPressTimeout());



        mGestureNavigationSettingsObserver = new GestureNavigationSettingsObserver(

                mContext.getMainThreadHandler(), mContext, this::updateCurrentUserResources);

                mContext.getMainThreadHandler(), mContext, this::onNavigationSettingsChanged);



        updateCurrentUserResources();

        sysUiFlagContainer.addCallback(sysUiFlags -> mSysUiFlags = sysUiFlags);
@@ -263,6 +267,14 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
        mTouchSlop = ViewConfiguration.get(mContext).getScaledTouchSlop() * backGestureSlop;

    }



    private void onNavigationSettingsChanged() {

        boolean wasBackAllowed = isHandlingGestures();

        updateCurrentUserResources();

        if (wasBackAllowed != isHandlingGestures()) {

            mStateChangeCallback.run();

        }

    }



    @Override

    public void onUserSwitched(int newUserId) {

        updateIsEnabled();

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

+2 −2
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ public class NavigationBarView extends FrameLayout implements 


        mNavColorSampleMargin = getResources()

                        .getDimensionPixelSize(R.dimen.navigation_handle_sample_horizontal_margin);

        mEdgeBackGestureHandler = new EdgeBackGestureHandler(

                context, mOverviewProxyService, mSysUiFlagContainer, mPluginManager);

        mEdgeBackGestureHandler = new EdgeBackGestureHandler(context, mOverviewProxyService,

                mSysUiFlagContainer, mPluginManager, this::updateStates);

        mRegionSamplingHelper = new RegionSamplingHelper(this,

                new RegionSamplingHelper.SamplingCallback() {

                    @Override