Merge "Revert "Move binder call to bg thread"" into tm-qpr-dev am: 432c49aa7f

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

Change-Id: I9f8e56710e7a6297d7a24f4397454f4d00c1706c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bidhya Sharma
2022-07-07 00:53:20 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 10 deletions

View File

@@ -626,7 +626,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
}
}, mainExecutor, bgExecutor);
mView.setBackgroundExecutor(bgExecutor);
mView.setEdgeBackGestureHandler(mEdgeBackGestureHandler);
mNavBarMode = mNavigationModeController.addListener(mModeChangedListener);
}

View File

@@ -88,7 +88,6 @@ import com.android.wm.shell.pip.Pip;
import java.io.PrintWriter;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
/** */
@@ -98,8 +97,6 @@ public class NavigationBarView extends FrameLayout {
final static boolean ALTERNATE_CAR_MODE_UI = false;
private Executor mBgExecutor;
// The current view is one of mHorizontal or mVertical depending on the current configuration
View mCurrentView = null;
private View mVertical;
@@ -352,10 +349,6 @@ public class NavigationBarView extends FrameLayout {
notifyVerticalChangedListener(mIsVertical);
}
public void setBackgroundExecutor(Executor bgExecutor) {
mBgExecutor = bgExecutor;
}
public void setTouchHandler(Gefingerpoken touchHandler) {
mTouchHandler = touchHandler;
}
@@ -775,8 +768,8 @@ public class NavigationBarView extends FrameLayout {
updateSlippery();
reloadNavIcons();
updateNavButtonIcons();
mBgExecutor.execute(() -> WindowManagerWrapper.getInstance()
.setNavBarVirtualKeyHapticFeedbackEnabled(!mShowSwipeUpUi));
WindowManagerWrapper.getInstance().setNavBarVirtualKeyHapticFeedbackEnabled(
!mShowSwipeUpUi);
getHomeButton().setAccessibilityDelegate(
mShowSwipeUpUi ? mQuickStepAccessibilityDelegate : null);
}