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

Commit 872dc79d authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Offload Luma Sampling IPC to background thread" into sc-v2-dev am: 69eef091 

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

Change-Id: Ibd75deff7e7eadff2276419741356fc3b98e5ea8
parents ffc00be4 69eef091

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+3 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import java.io.PrintWriter; 
import java.util.HashMap;

import java.util.Map;

import java.util.Optional;

import java.util.concurrent.Executor;

import java.util.function.Consumer;



public class NavigationBarView extends FrameLayout implements
@@ -354,6 +355,7 @@ public class NavigationBarView extends FrameLayout implements 
        mEdgeBackGestureHandler = Dependency.get(EdgeBackGestureHandler.Factory.class)

                .create(mContext);

        mEdgeBackGestureHandler.setStateChangeCallback(this::updateStates);

        Executor backgroundExecutor = Dependency.get(Dependency.BACKGROUND_EXECUTOR);

        mRegionSamplingHelper = new RegionSamplingHelper(this,

                new RegionSamplingHelper.SamplingCallback() {

                    @Override
@@ -376,7 +378,7 @@ public class NavigationBarView extends FrameLayout implements 
                    public boolean isSamplingEnabled() {

                        return isGesturalModeOnDefaultDisplay(getContext(), mNavBarMode);

                    }

                });

                }, backgroundExecutor);



        mNavBarOverlayController = Dependency.get(NavigationBarOverlayController.class);

        if (mNavBarOverlayController.isNavigationBarOverlayEnabled()) {

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.systemui.plugins.NavigationEdgeBackPlugin; 
import com.android.systemui.statusbar.VibratorHelper;



import java.io.PrintWriter;

import java.util.concurrent.Executor;



public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPlugin {
@@ -349,6 +350,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
                .getDimension(R.dimen.navigation_edge_action_drag_threshold);

        setVisibility(GONE);



        Executor backgroundExecutor = Dependency.get(Dependency.BACKGROUND_EXECUTOR);

        boolean isPrimaryDisplay = mContext.getDisplayId() == DEFAULT_DISPLAY;

        mRegionSamplingHelper = new RegionSamplingHelper(this,

                new RegionSamplingHelper.SamplingCallback() {
@@ -366,7 +368,7 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
                    public boolean isSamplingEnabled() {

                        return isPrimaryDisplay;

                    }

                });

                }, backgroundExecutor);

        mRegionSamplingHelper.setWindowVisible(true);

        mShowProtection = !isPrimaryDisplay;

    }

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/RegionSamplingHelper.java

+14 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.ViewTreeObserver; 
import com.android.systemui.R;



import java.io.PrintWriter;

import java.util.concurrent.Executor;



/**

 * A helper class to sample regions on the screen and inspect its luminosity.
@@ -52,6 +53,7 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
     */

    private final Rect mRegisteredSamplingBounds = new Rect();

    private final SamplingCallback mCallback;

    private final Executor mBackgroundExecutor;

    private boolean mSamplingEnabled = false;

    private boolean mSamplingListenerRegistered = false;
@@ -82,7 +84,9 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
        }

    };



    public RegionSamplingHelper(View sampledView, SamplingCallback samplingCallback) {

    public RegionSamplingHelper(View sampledView, SamplingCallback samplingCallback,

            Executor backgroundExecutor) {

        mBackgroundExecutor = backgroundExecutor;

        mSamplingListener = new CompositionSamplingListener(

                sampledView.getContext().getMainExecutor()) {

            @Override
@@ -183,10 +187,13 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
                // We only want to reregister if something actually changed

                unregisterSamplingListener();

                mSamplingListenerRegistered = true;

                SurfaceControl registeredStopLayer = stopLayerControl;

                mBackgroundExecutor.execute(() -> {

                    CompositionSamplingListener.register(mSamplingListener, DEFAULT_DISPLAY,

                        stopLayerControl, mSamplingRequestBounds);

                            registeredStopLayer, mSamplingRequestBounds);

                });

                mRegisteredSamplingBounds.set(mSamplingRequestBounds);

                mRegisteredStopLayer = stopLayerControl;

                mRegisteredStopLayer = registeredStopLayer;

            }

            mFirstSamplingAfterStart = false;

        } else {
@@ -199,7 +206,9 @@ public class RegionSamplingHelper implements View.OnAttachStateChangeListener, 
            mSamplingListenerRegistered = false;

            mRegisteredStopLayer = null;

            mRegisteredSamplingBounds.setEmpty();

            mBackgroundExecutor.execute(() -> {

                CompositionSamplingListener.unregister(mSamplingListener);

            });

        }

    }